am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '42e82f80fef7b1f13c9c3ab184cea065f4f4edbc':
  Copy the bionic -fstack-protector hack into libbacktrace.