Merge "Revert "HACK: disable emulator on x86_64""