Merge "Speedup div/rem by constants on x86 and x86_64"

diff --cc compiler/Android.mk
Simple merge

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

diff --cc compiler/utils/x86_64/assembler_x86_64.cc
Simple merge

diff --cc compiler/utils/x86_64/assembler_x86_64.h
Simple merge

diff --cc compiler/utils/x86_64/assembler_x86_64_test.cc
Simple merge