Merge "adb: fix double close in jdwp_service." am: da6ab73420 am: c4c55853f0
am: 743277e866

Change-Id: Ieb95741f0656c79dba1446410c9aa3949e153e5f