am a2ae59e0: Merge "Support map data in the backtrace data structure."

* commit 'a2ae59e0fe942981d2ef7ad9196fe29d2aee26be':
  Support map data in the backtrace data structure.