am ed974e9e: Merge change 23724 into eclair

Merge commit 'ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429' into eclair-plus-aosp

* commit 'ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429':
  Fix x86 call bridge