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

Change-Id: I9cc87256a9611bdcf9fa58b11bbe0b65fd64cce6