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

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

Change-Id: Ia942b0c5a508fc6ac0175edbb5e3e089bc73aad1