Merge from upstream, SVN change #209972
Merge branch 'upstream'

Conflicts:
	CMakeLists.txt
	configure
	include/llvm/MC/MCExpr.h
	lib/Target/LLVMBuild.txt