Merge "adb: refactor jdwp_service.cpp."