am 7e300d60: Merge "Enable stack-protector for x86"

* commit '7e300d60bfc325e3cbf3e7656297c14109e513b8':
  Enable stack-protector for x86