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

Change-Id: I9aaf0ec0c9ba7dab9825da5eb7629a54c4068aeb