am 57a477ff: am 6f9b7562: am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"

* commit '57a477ff2e3dc853d24ca4ce490dbc50feeca3c8':
  x86: Disable stack-protector until bionic is fixed