Merge "Generate more stack maps during native debugging." am: 875773770a
am: 388c61cc3c

* commit '388c61cc3c9f2d6d7cbcbd594dc90446227bce46':
  Generate more stack maps during native debugging.