Merge "Fix regression caused by libbacktrace API change."