This reverts commit 84b6292c33.
84b6292c33
Change-Id: Ic5b8a2742c7141156ab0f00ca29097bfe92bce60
step 2: move libutils headers to their new home: androidfw Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef