am 24419f3c: (-s ours) am ce2047a9: am 1a706865: Merge "Fix const-ness of strrchr callers."

* commit '24419f3c2e5b821e8f3efcfef32c9d530f0bd0d9':