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

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