Merge "Fix regression caused by libbacktrace API change."
am: 0ba2c9f4a2

Change-Id: I16e50d5d317cd43440338c1ad0da7aacaadc43a2