am c9c401e6: Merge "Move map data into backtrace data proper."

* commit 'c9c401e64ba00e8fa295cae30b2b0035fae1183a':
  Move map data into backtrace data proper.