am fb67f05d: Merge changes I53b2ada9,I30794ea5

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