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

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