Merge "FORTIFY_SOURCE: add snprintf, vsnprintf"