Split and remove pkg/stringutils Upstream-commit: aea31ab242a1e5f489f1597a726267ed190a3095 Component: engine