Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"