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

* commit 'e4068e3399d6d572d2f9bd7f925f080a74122d60':
  Fix x86 cfi directives for syscalls.