am 7a34ed2b: Merge "clean up FORTIFY_SOURCE handling."

* commit '7a34ed2bb36fcbe6967d8b670f4d70ada1dcef49':
  clean up FORTIFY_SOURCE handling.