am 9bee9d7d: (-s ours) am bb164eb6: Merge "Fix 64 bit emulator booting (again)."

* commit '9bee9d7d1137090dfd015d3b894bf5593a057991':
  Fix 64 bit emulator booting (again).