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

* commit '0f47a94d2eb50f30b7f559c7c7fc2a8632412cc8':
  Enable stack-protector for x86