Merge "Move frameworks/base/tools/ off AndroidConfig.h."