am 58e9add4: am 987b2e66: Merge "Simplify floating-point comparisons with NaN in Optimizing."

* commit '58e9add4a3ecc941f2ef53c47877529414fd2495':
  Simplify floating-point comparisons with NaN in Optimizing.