am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"

* commit '2609640eaea1ba89a493cff2847cb9ec993dc9fc':
  Add an explicit definition of __ANDROID__=1