am 94170742: Merge "Fix x86 cfi directives for syscalls."

* commit '941707429d8577e90580277c51ad8a354f664586':
  Fix x86 cfi directives for syscalls.