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

Change-Id: I99d2fcdfcfc1712d0281c86188b3e05082a76d18