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

* commit 'b5c24e096d34e0f096d574f2aa799cd2dc6fc7db':
  More libbacktrace fixes.