This reverts commit r313488, because it breaks compilation on Android and breaks llvm-lto. llvm-svn: 313489