Merge changes Iad2d6bb9,I4b9add35,I42317345 am: b80d209289 am: 7d1b679848

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/2016822

Change-Id: I38e1487500ebb9a552f88b0e34ab2befd0c59535