Merge "x86_64: Fix fp-to-core conversion"