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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I156eb24354b63c737c14e176f0710319476e21ab