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

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

Change-Id: I4cc072294518a58e9bee2b52fb05a90ac8357f81