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

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

Change-Id: I997ffe5b7bc4d76ad7341c84a531fcc45c1702cc