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

* commit '12a9c9058e85a32b8676999f910201aed50707e4':