[sanitizer] Reverting rCRT329595

Summary:
Even this version seems to mess with Android somehow. Reverting for now while
I figure out what's up.

Subscribers: kubamracek, delcypher, #sanitizers, llvm-commits

Differential Revision: https://reviews.llvm.org/D45450

llvm-svn: 329606
GitOrigin-RevId: 09873b2bcf02ffcbdda3371d3d335264d4a870bb