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

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

Change-Id: Ibc22b551b5fce7b4363105a2cd87a09caf09c0bc