Fix more tests on JDK 9 and 10
Fix more tests on JDK 9 and 10

PiperOrigin-RevId: 211938679

twitter-forks/bazel,davidzchen/bazel,twitter-forks/bazel,perezd/bazel,dslomov/bazel,ButterflyNetwork/bazel,dslomov/bazel-windows,akira-baruah/bazel,meteorcloudy/bazel,perezd/bazel,perezd/bazel,katre/bazel,safarmer/bazel,dslomov/bazel,dslomov/bazel,twitter-forks/bazel,dslomov/bazel-windows,akira-baruah/bazel,perezd/bazel,davidzchen/bazel,ulfjack/bazel,twitter-forks/bazel,dslomov/bazel,bazelbuild/bazel,ulfjack/bazel,cushon/bazel,meteorcloudy/bazel,davidzchen/bazel,aehlig/bazel,safarmer/bazel,aehlig/bazel,werkt/bazel,cushon/bazel,katre/bazel,bazelbuild/bazel,akira-baruah/bazel,bazelbuild/bazel,twitter-forks/bazel,bazelbuild/bazel,dslomov/bazel,bazelbuild/bazel,dslomov/bazel-windows,meteorcloudy/bazel,katre/bazel,davidzchen/bazel,ButterflyNetwork/bazel,ButterflyNetwork/bazel,ButterflyNetwork/bazel,aehlig/bazel,werkt/bazel,akira-baruah/bazel,davidzchen/bazel,bazelbuild/bazel,dslomov/bazel-windows,meteorcloudy/bazel,werkt/bazel,cushon/bazel,safarmer/bazel,ButterflyNetwork/bazel,katre/bazel,werkt/bazel,twitter-forks/bazel,aehlig/bazel,davidzchen/bazel,ulfjack/bazel,perezd/bazel,aehlig/bazel,twitter-forks/bazel,werkt/bazel,ulfjack/bazel,aehlig/bazel,dslomov/bazel,cushon/bazel,cushon/bazel,meteorcloudy/bazel,meteorcloudy/bazel,ulfjack/bazel,aehlig/bazel,cushon/bazel,akira-baruah/bazel,dslomov/bazel-windows,dslomov/bazel-windows,ulfjack/bazel,meteorcloudy/bazel,safarmer/bazel,davidzchen/bazel,werkt/bazel,perezd/bazel,safarmer/bazel,ulfjack/bazel,akira-baruah/bazel,safarmer/bazel,dslomov/bazel,ButterflyNetwork/bazel,katre/bazel,katre/bazel,perezd/bazel