am 5682a23e: am fef8bcf9: Merge "Explicitly use clang."

* commit '5682a23ed41f50057887870f1aa9848b13a26190':
  Explicitly use clang.