[sanitizer] reapply r172719, r172721-172723, r172725, and also fix the warning on Mac.

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