am f125ad41: am b14a0fbe: am 4bb014fd: Merge "Revert "Revert "Optimizing: Fix long-to-fp conversion on x86."""

* commit 'f125ad41754808445d24c8d533c8ca619a401bee':
  Revert "Revert "Optimizing: Fix long-to-fp conversion on x86.""