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

Change-Id: I8c93880d7af901b1e54554f5534ad720bb7c1aab