Merge "Fix problems in libbacktrace."