Merge "Change string compression encoding."

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

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

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

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

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

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

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

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

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

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

diff --cc runtime/arch/arm/quick_entrypoints_arm.S
Simple merge

diff --cc runtime/arch/arm64/quick_entrypoints_arm64.S
Simple merge

diff --cc runtime/arch/x86/quick_entrypoints_x86.S
Simple merge

diff --cc runtime/arch/x86_64/quick_entrypoints_x86_64.S
Simple merge