Merge "clean up FORTIFY_SOURCE handling."