Merge "Update build-tools to ab/7356487"