[msan] Partial revert of r210331.

Bots did not like it.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@210332 91177308-0d34-0410-b5e6-96231b3b80d8