am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."

* commit '84a04d52e7118f67e9a099fdbf55111f1c7a9010':
  Move frameworks/base/tools/ off AndroidConfig.h.