Remove apache specific socket factory API.

Note that this change also includes another (non-breaking) update from
another of my changes from a month ago. I guess nobody has updated API on
master in a very long time..

bug: 18027885
Change-Id: I1fb1bcdaac07131c3bc43b13ad21cacd12a2e7c8