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