Merge "Use clang-r428724 for clang-tools build"