Merge "Combine tcp_connect and socket_spec_connect."
am: 539c4d427b

Change-Id: I9a77cde0bdda07c2a90e54c76fb5bc9abb2601a8