Revert 79231 and 79932.  They were temporary workarounds for Apple-style builds
and are no longer needed.

llvm-svn: 80172
2 files changed