am 267afcde: Merge "HACK: disable emulator on x86_64"
am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '267afcdefe3a6da9b72a9c70d238abb00be69949':
  HACK: disable emulator on x86_64

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build