Merge "Support WITHOUT_CLANG builds"