Merge "Fix builds where _FORTIFY_SOURCE is off."