Merge changes Iad2d6bb9,I4b9add35,I42317345 am: b80d209289

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

Change-Id: I78e0ca0380e957376f987bd670217e5f8982b7c0