am 58a1c07b: Merge "Cleanup JDWP event matching"

* commit '58a1c07b7f01ed9b85fb89bfd4dab7ddd138cfcd':
  Cleanup JDWP event matching