More cleanup.
More cleanup.

RELNOTES: None.
PiperOrigin-RevId: 215561598

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