am 7a432f8c: am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."

* commit '7a432f8cf2f16611a2964c1208d363ffc0e0be9f':
  Workaround the __builtin_isnan() type error for clang 3.4.