Update build-tools to ab/6869517 am: 48542e4070 am: 6e784c8963

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

Change-Id: Ifd64736893078c5519678b263cce11e81578738c