Merge "Add support for WITHOUT_CLANG"