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

* commit '11728ce9bbfaaf3599566b94d6a4207fde749beb':
  Workaround the __builtin_isnan() type error for clang 3.4.