Merge "Be smarter about stack-protector on the host."
am: 19e85a25ee

* commit '19e85a25eefe5fbb12a7121a6b87a0e5d87be39b':
  Be smarter about stack-protector on the host.