am 2cc25440: Merge "Enable clang compilation."

* commit '2cc2544024364ec532a6d49131cb842fe9b559ae':
  Enable clang compilation.