Revert the revert 253497 and 253539 - These commits aren't the cause of the...

Revert the revert 253497 and 253539 - These commits aren't the cause of the clang-cmake-mips failures.

Sorry for the noise.

llvm-svn: 253662