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

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

Change-Id: If64e29cc06dfc18a13dc006b10c68d3390056011