Push back various changes for building Apple's compiler-rt dylib.

These changes had accumulated internally at Apple for no good reason.