Merge changes from topics "target-build-unbundled", "unbundled-preopt" am:...

Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: 77112df7 am: 9d7c4c0a am: 1a55074c am: b7707161

Original change: https://android-review.googlesource.com/c/platform/build/+/1324517

Change-Id: I712bfc62acaaf100fd3893d994e97404d1afd42c