am 158800c9: (-s ours) am 30a18bca: am a3fa59b1: Merge "Kill host Linux AndroidConfig.h."

* commit '158800c9edc2edb2e946c7c45929a1bede34090c':