am 30a18bca: am a3fa59b1: Merge "Kill host Linux AndroidConfig.h."

* commit '30a18bca6222065d15e1b18d71a29a8fb921d4a8':
  Kill host Linux AndroidConfig.h.