Revert compiler-rt diffs for order file instrumentation to get bot green!

This caused issues on Linux/Windows and other platforms.

r355343 355350 355350

llvm-svn: 355363