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

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