Update build-tools to ab/7855960 am: 968c105d60 am: 961ef7afbc

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

Change-Id: Iaefe08417c0352da248bfc3d127a7c01e9c2c4bf