Merge "Make libbacktrace build with LLVM r275480" am: f6653de814
am: d3ce6da7e5

Change-Id: Idd308fca6dd2fa51d3b9b04156bb2c0c919d3353