Merge "Enable 64-bit emulator for MacOSX host"