am ccf7c39d: am 36ba1db4: Merge "Remove unused entries from AndroidConfig.h."

* commit 'ccf7c39d628ca5a2070c8f7972178156460d6125':
  Remove unused entries from AndroidConfig.h.