Avoid picking port 65535 for ServerSockets, when any is requested.

runtime/bin/socket_android.cc

Index: runtime/bin/socket_android.cc
diff --git a/runtime/bin/socket_android.cc b/runtime/bin/socket_android.cc
index d83789297b2af6c7a75870e990c498aa19e7c0b7..748f33ecbe0ec59d74cd66e7a4aecffea251a112 100644
--- a/runtime/bin/socket_android.cc
+++ b/runtime/bin/socket_android.cc
@@ -323,6 +323,17 @@ intptr_t ServerSocket::CreateBindListen(RawAddr addr,
     return -1;
   }
 
+  // Test for invalid socket port 65535 (some browsers disallow it).
+  if (port == 0 && Socket::GetPort(fd) == 65535) {
+    // Don't close fd until we have created new. By doing that we ensure another
+    // port.
+    intptr_t new_fd = CreateBindListen(addr, 0, backlog, v6_only);
+    int err = errno;
+    TEMP_FAILURE_RETRY(close(fd));
+    errno = err;
+    return new_fd;
+  }
+
   if (TEMP_FAILURE_RETRY(listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
     TEMP_FAILURE_RETRY(close(fd));
     return -1;