Merge "Fix -fstack-protector-strong for x86."
am: 6500f51c0e

* commit '6500f51c0e3ef37dbda889dbd1125c03c787ae50':
  Fix -fstack-protector-strong for x86.