Merge "Update build-tools to ab/7149640"