am ae37b34a: am dfc56e68: Merge "Clean-up call_x86.cc"

* commit 'ae37b34ab1c836a2d40977d3c28199a9d8794179':
  Clean-up call_x86.cc