Merge "adb: don't close sockets before hitting EOF." am: 2185d8ceef
am: 36d5c2ae9c

Change-Id: I2ae1ec58fd0f32fdc8b38ee8c810607fe357c2b8