Merge "JDWP: fix breakpoint for method in the image" into lmp-mr1-dev