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

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