Merge "ART: Extract JNI macro assembler for x86"

diff --cc compiler/Android.mk
Simple merge

diff --cc compiler/utils/jni_macro_assembler.cc
index 0b1aa08,6fdf09b..1acc90c
--- 1/compiler/utils/jni_macro_assembler.cc
--- 2/compiler/utils/jni_macro_assembler.cc
+++ b/compiler/utils/jni_macro_assembler.cc
@@@ -33,10 -33,10 +33,10 @@@
  #include "mips64/assembler_mips64.h"
  #endif
  #ifdef ART_ENABLE_CODEGEN_x86
- #include "x86/assembler_x86.h"
+ #include "x86/jni_macro_assembler_x86.h"
  #endif
  #ifdef ART_ENABLE_CODEGEN_x86_64
 -#include "x86_64/assembler_x86_64.h"
 +#include "x86_64/jni_macro_assembler_x86_64.h"
  #endif
  #include "base/casts.h"
  #include "globals.h"