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

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

Change-Id: I4b19b84e6d844b49a2da6cbc92b9981751269543