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

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