Merge "Update build-tools to ab/7356487" am: 0a6e35fd5a am: 0d41e6ff83 am: c0162034c4 am: 89dee9ed1b

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

Change-Id: I8bf7e09ad7a9f75377229d418eab965ec081d590