am 3b9097d5: Merge "Combine JDWP location events"

* commit '3b9097d502fbe47ec897db3ab64f70b5e0d309c9':
  Combine JDWP location events