Merge "Fix const-ness of strrchr callers."