swift234

Revert "s/clangRewrite/clangRewriteCore"

Apple clang has this change, so we need to keep up to fix the
Jenkins builds.

This reverts commit r20069

Swift SVN r20094