am 6b7b6541: am b5c24e09: am 8c58086c: Merge "More libbacktrace fixes."

* commit '6b7b65417aead0189681c12d9162f31e8bc9b3e5':
  More libbacktrace fixes.