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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I801ae6f756b708f6cdb3d98a7ce6632dad13947f