tsan: fix merge bug


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@183648 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: disable getaddrinfo() interceptor for tsan (causes recursion)


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