am 696c48df: am eba7c15b: Merge "Revert "Switch libm to building with clang.""

* commit '696c48df69a0841e8e179e313302c01155df5e85':
  Revert "Switch libm to building with clang."