Merge "Do not assume CLANG is used when custom toolchain is provided"