am 2d7e2373: am 108a9acc: Merge "JDWP: fix breakpoint for method in the image" into lmp-mr1-dev

* commit '2d7e2373c8d0c54a14eec52c69df6fc3ba50472b':
  JDWP: fix breakpoint for method in the image