Merge "FORTIFY_SOURCE: strcat / strncat optimize"