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

Change-Id: I73cee33a05817ed821422af1d4ef2e1ff6acdbeb