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

Change-Id: I8391254566ecde34bd01a0185785624b1d4434d3