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

Change-Id: Ifcf07cefa0279b8f4c8ac4d55db46b6701b86595