Merge changes Ic07050a8,Idae22d9e am: bbc5162234 am: 819f4e1f22 am: 7777258ed5 am: 97b5a9f769

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

Change-Id: Icb204cb57ce51e19841070c4634d234735fe380d