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

Change-Id: If3b7d76a9f70a3e16e57d3042effbad5f4a3edb3