am 8c58086c: Merge "More libbacktrace fixes."

* commit '8c58086c54a23d33e915852a1355a171b09679cc':
  More libbacktrace fixes.