am ce1922dc: am 4370d3d3: Merge "x86_64: Fix fp-to-core conversion"

* commit 'ce1922dc16d87ca6c5368e4d268d5bca2eddf509':
  x86_64: Fix fp-to-core conversion