Merge "Assume fp operations can also take a constant on x86." am: 371d75ef9e
am: d88f688563

* commit 'd88f6885635e0005553def73e53aae14dc82370e':
  Assume fp operations can also take a constant on x86.