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

* commit '39d848b1b4a00ba7bc79242f746197e39d878310':
  Be smarter about stack-protector on the host.