am 1e23a06f: Fix build by moving to clang.

* commit '1e23a06f663cc1d56f9a57a317d0d84d6dd788f0':
  Fix build by moving to clang.