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

Change-Id: I2ec7b7b6f008cdca091160536e959ab5dc661024