Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"