am 92a3d2ba: (-s ours) am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h."

* commit '92a3d2ba32cbfcd329630cc1b2e4787bf4496048':