Merge "Update build-tools to ab/9088018" am: 51a21532a5 am: 1c137634d9

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

Change-Id: I1215a87f111e11f68d522c4e2db8b3f40d2f68ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>