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

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