am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"

* commit '88765facf16ad4887bf6a1c91c64839ecda9d081':
  Bump __clang_minor__ check to 6 for __builtin_isnan