Merge "FORTIFY_SOURCE: don't define s?printf macros if already defined"