am 1cb94072: Merge "Enable clang compilation."

* commit '1cb9407218ede2706baef0017f510c94308e5c69':
  Enable clang compilation.