am 0a2cb815: Merge "Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '0a2cb815974ea96af664fa966079966a08916722':
  Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces.