Merge "Fix InetSocketAddress.getHostString(): return the name if available"