Merge "Fix x86 cfi directives for syscalls."