Merge "adb: fix double close in jdwp_service." into pi-dev