Merge "adb: detect closed jdwp socket." am: e1c4e04f82
am: 7e5b10b18c

Change-Id: Idc8db41aab19b5895b28642b77821f1fa4610218