Merge "Update build-tools to ab/7864249" am: 68a6156110 am: 660479f17a am: 07ad826244 am: cc76e9e347

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

Change-Id: I64d26ee429c1a48e8234b3f8de99a4527c7a6e3f