am 49f80c6f: am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."

* commit '49f80c6f3795a4f3a888ca80e15b15204f4b61b5':
  Remove the now-empty darwin AndroidConfig.h.