am 949bd4c2: Merge "Print ABI in backtraces."

* commit '949bd4c208fb9e2ccea2cb0ed76fafef7a5cecea':
  Print ABI in backtraces.