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

* commit 'cb606e1fe286507f17d35373e6b8cb295c27eeee':
  Bump __clang_minor__ check to 6 for __builtin_isnan