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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build