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

* commit '1653580011b34b431c39eaca4fb703ef493af5cf':
  Remove unused entries from AndroidConfig.h.