Merge "Update build-tools to ab/6823227" am: dedb8ebca5 am: d2eb04a32d am: 3cde3da409 am: 8c3d9cd7ab

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

Change-Id: I192aaa0b637d0a98c4c295fa5abf7504d8e99a4b