Merge change 23724 into eclair

* changes:
  Fix x86 call bridge