Merge "Revise checks for MacOSX to build emulator"