Merge "Update build-tools to ab/6702419" am: d020de865f am: 128e456b61 am: 72d1169e2a

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

Change-Id: I40be97efce784b173245234136438561dff8211d