am e624fd28: Merge "Put prebuilt emulator path after host output"

* commit 'e624fd281a74b42828a1902dfff11503f95fe28d':
  Put prebuilt emulator path after host output