am 640228b8: am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error."

* commit '640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd':
  Disable clang++ due to compiler error.