Merge "More libbacktrace fixes."