Merge "Fix 64 bit emulator booting (again)."