Merge changes from topic "move-build-prebuilts" am: 1deecd13b5 am: 23c0545a22
am: dcd51ff327

Change-Id: I2b575edb8fb51421d198a87d4c732fb59b9f3056