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

* commit '88c1addf1108927d25dd84b760867e8f6ebf1f99':
  Combine JDWP location events