am 172cd765: Merge "Allow coverage with clang."

* commit '172cd7653e4dfb628065349ea915329076e44e1d':
  Allow coverage with clang.