am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"
am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"

* commit '2ea957a373018ba6773c621065164256f0d84078':
  Revise checks for MacOSX to build emulator

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