Address additional warnings found by GCC 4.9.

Change-Id: I8aae6c3e1ccc2294f4db455e1b4f3b4c34a00aaf
Merge "Address additional warnings found by GCC 4.9."
Fix win32 undefined reference to `_socket_network_client_timeout'.

Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
Merge "Fix win32 undefined reference to `_socket_network_client_timeout'."
auto-merger: merge in from aosp/master