Merge "Revert "[optimizing] Improve x86 parallel moves/swaps""

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/optimizing/parallel_move_resolver.cc
Simple merge

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