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