am 1df8987a: am c3cde2c0: JDWP: properly combine location events

* commit '1df8987ae5ac56eeaf50eaca9bf0dd284126b3dc':
  JDWP: properly combine location events