Merge "Update build-tools to ab/7149640" am: 2bf81b65af am: b1161f86e3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I934d42f034392c52368110a8c735a2a881f67d51