Force llvm / icc in corresponding patch release.
Merge pull request #785 from ktf/fix-clang-patches

Fix clang patches