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

Change-Id: I9e8aa326adde3904881d08953dacb08809c2a727