Revert "Revert "Update build-tools to ab/8357123"" am: c9fa001172 am: 564b03ca22

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

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