am 239fb56b: am 6046f418: am 2cc25440: Merge "Enable clang compilation."

* commit '239fb56bcf3eac515a6f9036a49eba28520caa31':
  Enable clang compilation.