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

* commit '36ba1db405637ef97276103fced526f5e5d9e354':
  Remove unused entries from AndroidConfig.h.