Merge "Fix OldSocketTest#test_connectLjava_net_SocketAddressI"