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

Change-Id: I3a90d49d84cdf01337c9f810b11abd0a7528e0f1