Merge "Revert "Remove unused String8::setPathName.""