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

Change-Id: I6339087d16b4f579e00fe608c5562702b0375c92