Merge from upstream, SVN change #200612

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
Merge branch 'vendor'
Upstream SVN @200612

Conflicts:
	configure
	include/llvm/Object/ELFObjectFile.h
	lib/Object/ELF.cpp
	tools/clang/CMakeLists.txt
	tools/lld/lib/ReaderWriter/ELF/File.h