Merge "Follow up of "div/rem on x86 and x86_64", to tidy up the code a little."

diff --cc compiler/optimizing/code_generator_x86.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86.h
Simple merge

diff --cc compiler/optimizing/code_generator_x86_64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86_64.h
Simple merge