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

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