Merge \\"adb: refactor jdwp_service.cpp.\\" am: 71d11ade9d
am: a4e35be4a4

Change-Id: I7bbc7c8b3df8cd2aa37bd41dfb53fda8b841cbb9