am acde2e0d: Merge "Drop clang version check for __builtin_isinf and __builtin_isnan"

* commit 'acde2e0dea5d62894dacbe64da534cc2557a1d61':
  Drop clang version check for __builtin_isinf and __builtin_isnan