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

* commit 'fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1':
  Revise checks for MacOSX to build emulator