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

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

Change-Id: I53f892585715c7423f929ad53d5b71f0b9097b3d