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

Change-Id: I08f773eede00bc05af80777c19570d5b005004d6