Merge "Fix Windows socket_network_client.c build failures."