tsan: fix failing CHECK In deadlock detector
and re-enable the test



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