Manual merge from gingerbread-plus-aosp

Change-Id: If048354f9b80bcaa1e97df5c31c3df80231eb612
diff --git a/native/Android.mk b/native/Android.mk
index bbbff1e..2de3892 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -12,11 +12,13 @@
 
 #FLAG_DBG := true
 
+ifneq ($(TARGET_ARCH),x86)
 ifneq ($(FLAG_DBG), true)
     LOCAL_NDK_VERSION := 4
 endif
 
 LOCAL_SDK_VERSION := 8
+endif #TARGET_ARCH = x86
 
 LOCAL_MODULE := libjni_latinime