Merge "Clean up more recursive FORTIFY_SOURCE calls"