am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."

* commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
  Switch x86_64 emulator to 64 bit primary.