Merge "Fix JDWP location event report on return instructions"