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

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