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