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

Change-Id: I9c5ccfdc32cff0587a4ff6d785adcd97e25dfbbf