am 3b40a7ed: am 3b9097d5: Merge "Combine JDWP location events"

* commit '3b40a7edc8914d2c202f2d86d8348ef838772014':
  Combine JDWP location events