Merge "Move libutils off AndroidConfig.h."