Merge "Clean-up call_x86.cc"