Merge changes I53b2ada9,I30794ea5

* changes:
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.