am b374fdba: Merge "Fix JDWP location event report on return instructions"

* commit 'b374fdba01c1c8fd59c1d0f0887451acdf24e90f':
  Fix JDWP location event report on return instructions