Merge "Revert "adb: don't close sockets before hitting EOF."" am: 58d5906be3 am: 8dce3157e6
am: 31128d9de0

Change-Id: I0114805ccedb29310e5f4cb50781bfd51d60cb66