[tsan] simplify tsan-vs-gvn test since gvn vs tsan is now fixed; fix lint 

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