am 85cc860f: am ce2047a9: am 1a706865: Merge "Fix const-ness of strrchr callers."

* commit '85cc860fcb0317c48555e258de0b77f62e6cb5ab':
  Fix const-ness of strrchr callers.