Merge "Revert "adb: check our socketpair ends in our win32 emulation."" am: c1314c8b13
am: 83b3c0817f

Change-Id: I316e666330a3e9ae7ff4cf8fca43fdf803d5612c