Merge "Disable clang++ due to compiler error."