Merge "Update build-tools to ab/11785046" into main