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

* commit '3efb007ef9de6598705cda94167bf3726e9c1d8d':