Merge "Fix regression caused by libbacktrace API change." am: 0ba2c9f4a2 am: 91f68e9340
am: 4794e07e0a

Change-Id: I3f6717ed6ec359608ab049729801078b5e973a73