^/vendor/clang/dist, resolve conflicts, and cleanup patches.
preserve our customizations, where necessary.