Revert "[9.3.0] Add `-Djava.net.preferIPv6Addresses=system` to startup JVM args (https://github.com/bazelbuild/bazel/pull/29237)" (#31253)

Reverts bazelbuild/bazel#31079

Co-authored-by: Ian (Hee) Cha <heec@google.com>
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 5f67dd8..248872d 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -448,9 +448,6 @@
   // TODO: Drop this when protobuf uses VarHandle.
   result.push_back("-Dsun.misc.unsafe.memory.access=allow");
 
-  // Let the system decide whether to prefer IPv6
-  result.push_back("-Djava.net.preferIPv6Addresses=system");
-
 #if defined(_WIN32)
   // See and use more than 64 CPUs on Windows.
   // https://bugs.openjdk.org/browse/JDK-6942632
diff --git a/src/test/py/bazel/remote/cache_decompression_test.py b/src/test/py/bazel/remote/cache_decompression_test.py
index 40781d6..e6ca6cd 100644
--- a/src/test/py/bazel/remote/cache_decompression_test.py
+++ b/src/test/py/bazel/remote/cache_decompression_test.py
@@ -68,28 +68,17 @@
   address_family = socket.AF_INET6
 
 
-class HTTPServerDualStack(HTTPServer):
-  address_family = socket.AF_INET6
-
-  def server_bind(self):
-    # Disable IPV6_V6ONLY to allow IPv4 connections
-    self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
-    super().server_bind()
-
-
 class CacheDecompressionTest(test_base.TestBase):
 
   def setUp(self):
     test_base.TestBase.setUp(self)
-    if socket.has_dualstack_ipv6():
-      self.httpd = HTTPServerDualStack(('::', 0), MemoryStorageHandler)
-      _, server_port, _, _ = self.httpd.server_address
-    elif socket.has_ipv6:
-      self.httpd = HTTPServerV6(('::', 0), MemoryStorageHandler)
-      _, server_port, _, _ = self.httpd.server_address
+    server_port = self.GetFreeTCPPort()
+    if self.IsDarwin():
+      self.httpd = HTTPServerV6(
+          ('localhost', server_port), MemoryStorageHandler
+      )
     else:
       self.httpd = HTTPServer(('localhost', server_port), MemoryStorageHandler)
-      _, server_port = self.httpd.server_address
     self.httpd.storage = {}
     self.url = 'http://localhost:{}'.format(server_port)
     self.background = threading.Thread(target=self.httpd.serve_forever)
@@ -134,6 +123,13 @@
     self.AssertFileContentEqual(
         os.path.join(bazel_genfiles, 'genrule.txt'), content)
 
+  def GetFreeTCPPort(self):
+    tcp = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    tcp.bind(('localhost', 0))
+    _, port = tcp.getsockname()
+    tcp.close()
+    return port
+
   def AssertFileContentEqual(self, file_path, entry):
     with open(file_path, 'r') as f:
       self.assertEqual(f.read().splitlines(), entry)
diff --git a/src/test/shell/bazel/testing_server.py b/src/test/shell/bazel/testing_server.py
index 42946c4..74598fa 100644
--- a/src/test/shell/bazel/testing_server.py
+++ b/src/test/shell/bazel/testing_server.py
@@ -45,15 +45,6 @@
   address_family = socket.AF_INET6
 
 
-class TCPServerDualStack(TCPServer):
-  address_family = socket.AF_INET6
-
-  def server_bind(self):
-    # Disable IPV6_V6ONLY to allow IPv4 connections
-    self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
-    super().server_bind()
-
-
 class Handler(BaseHTTPRequestHandler):
   """Handlers for testing HTTP server."""
   auth = False
@@ -165,10 +156,8 @@
     while port is None:
       try:
         port = random.randrange(32760, 59760)
-        if socket.has_dualstack_ipv6():
-          httpd = TCPServerDualStack(('::', port), Handler)
-        elif socket.has_ipv6:
-          httpd = TCPServerV6(('::', port), Handler)
+        if sys.platform == 'darwin':
+          httpd = TCPServerV6(('', port), Handler)
         else:
           httpd = TCPServer(('', port), Handler)
       except socket.error: