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

Change-Id: I6c438f986d63c3c5dd56435099afd406cc036cf9