Merge "Update build-tools to ab/6823227"