am c42bd509: am eb7c5b19: Merge "JDWP: properly combine location events"

* commit 'c42bd509e5a0e5a7634b7c8ebb18196523af08a9':
  JDWP: properly combine location events