am 2c1917f1: am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h."

* commit '2c1917f15653ea1aa67b105945f399a96e63cee0':
  Move libutils off AndroidConfig.h.