Merge "Fix win32 implicit declaration of function socket_network_client_timeout."