Remove casting-away-const-ness#2

rectang wants to merge 2 commits intoapache:cfish-string-prep1apache/lucy:cfish-string-prep1from

rectang:cfish-string-prep1rectang/lucy:cfish-string-prep1Copy head branch name to clipboard