am 64c058da: am 9ea0ff34: Merge "Clean up maps parsing in libbacktrace."

* commit '64c058da2335b37b7a179fd3ffef5cbf7b5e2a25':
  Clean up maps parsing in libbacktrace.