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

Change-Id: Id7e398b5e2058a591492d7f053700e5129e63349