am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5

* commit '873782ccd44349c766f5d74e65b3b323618dd6ed':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.