Merge "Drop CLANG and CLANG_CXX in the environment"