Merge "FORTIFY_SOURCE: fortify strrchr"