Merge "Workaround the __builtin_isnan() type error for clang 3.4."