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

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