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

Change-Id: I4dad711d64954010ab98d408fff1865971b42b94