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

Change-Id: I866db0edf055a4bb25b3c6351c88970543fae3c0