Merge "Update build-tools to ab/6702419"