Merge "Enable -fstack-protector-strong for x86." am: 7abad39b78
am: 49d443b6f7

* commit '49d443b6f717bc57371bf6dde950c9c5a7427151':
  Enable -fstack-protector-strong for x86.