am d0717e6e: am e4e88d7b: Merge "Revert "Optimizing: Fix long-to-fp conversion on x86.""

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