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

Change-Id: I95719d9aad8b1e30ed1620da11992e2e5d326e22