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

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