Merge "Update build-tools to ab/7356487" am: 0a6e35fd5a

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

Change-Id: Ieb68ff655b48e32516afa888891db6e1b4984f67