Merge "x86_64: Fix intrinsics"