Merge "ARM: VIXL32: Implement VIXL-based assembler."

diff --cc build/Android.gtest.mk
Simple merge

diff --cc compiler/Android.mk
index 37f48e1,99a09f2..08fd309
--- 1/compiler/Android.mk
--- 2/compiler/Android.mk
+++ b/compiler/Android.mk
@@@ -91,13 -94,12 +91,15 @@@ LIBART_COMPILER_SRC_FILES_arm := 
        linker/arm/relative_patcher_arm_base.cc \
        linker/arm/relative_patcher_thumb2.cc \
        optimizing/code_generator_arm.cc \
 +      optimizing/dex_cache_array_fixups_arm.cc \
 +      optimizing/instruction_simplifier_arm.cc \
 +      optimizing/instruction_simplifier_shared.cc \
        optimizing/intrinsics_arm.cc \
        utils/arm/assembler_arm.cc \
+       utils/arm/assembler_arm_vixl.cc \
        utils/arm/assembler_thumb2.cc \
        utils/arm/jni_macro_assembler_arm.cc \
+       utils/arm/jni_macro_assembler_arm_vixl.cc \
        utils/arm/managed_register_arm.cc \
  
  # TODO We should really separate out those files that are actually needed for both variants of an

diff --cc compiler/utils/arm/assembler_arm.h
Simple merge