am 6aa606c9: Merge "Update JDWP event filtering to avoid useless ids"

* commit '6aa606c9284ac31961f4c5b20c3645ac78acfaad':
  Update JDWP event filtering to avoid useless ids