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

* commit '6046f4180d6a333788ccdab21c909f2e40d2b073':
  Enable clang compilation.