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

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