Merge "FORTIFY_SOURCE: fortify strchr"