Merge "Assume fp operations can also take a constant on x86."