am e2946917: am ebaa337a: am c3b800aa: Merge "Fix JDWP line table output." into klp-dev

* commit 'e2946917852af9d2ec643c7c987d2bb66cf2f086':
  Fix JDWP line table output.