am 204d1f65: am b2c7e0c1: Merge "x86: Enable -fstack-protector"

* commit '204d1f65dbfc6d5a14a90627d9d1efcfce8261ee':
  x86: Enable -fstack-protector