[automerger skipped] Update build-tools to ab/7356487 am: 4d04adf116 -s ours

am skip reason: Merged-In I2d952ee500b70e6c20fd8767e68f8cc7a6638677 with SHA-1 9705735dfe is already in history

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

Change-Id: I1c1b07193f16dd8c18559989af9aa532cbffc7b9