am 0088703c: Merge "Modify to use new BacktraceMap creation function."

* commit '0088703cc24ef615e0427f58461c6c7f7aed17a4':
  Modify to use new BacktraceMap creation function.