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

* commit '8b2f6e1989ae4d6c9e13d3429c3e8145ec871dd5':
  JDWP: properly combine location events