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

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