am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"

* commit '6c5d89764848b604c01d0dca7104d9e075aed2b2':
  Refreshed gcc predefines __ANDROID__