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

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

Change-Id: Ia50a1066b25f39562a806f37f9045fd5708d09ff