Merge commit 'cd24b5c6633b27df2b84249a65a46a610b734494' from upstream.

Conflicts:
	include/llvm/IRReader/IRReader.h
	include/llvm/InitializePasses.h
	lib/Bitcode/Reader/BitcodeReader.h
	lib/IRReader/IRReader.cpp
	lib/LTO/LTOModule.cpp
	lib/MC/MCObjectStreamer.cpp
	lib/Target/ARM/ARMFrameLowering.h
	lib/Target/ARM/ARMTargetMachine.cpp
	lib/Target/ARM/Thumb1FrameLowering.h
	lib/Target/Mips/MipsMachineFunction.h
	lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
	lib/Target/X86/X86AsmPrinter.cpp
	lib/Target/X86/X86FastISel.cpp
	lib/Transforms/Scalar/CMakeLists.txt