Update build-tools to ab/8604402 am: 6232530a48 am: 23f7ef8769

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

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