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

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