Merge from upstream change #197871

svn co http://llvm.org/svn/llvm-project/llvm/trunk .
svn co http://llvm.org/svn/llvm-project/cfe/trunk tools/clang
svn co http://llvm.org/svn/llvm-project/lld/trunk tools/lld