Fixed some issues with android build

Android/jni/Android.mk

@@ -7,7 +7,13 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../NativePath $(LOCAL_PATH)/../../source
 
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O3 -DANDROID_NDK -Wall -D__ANDROID__
 
-ifeq ($(TARGET_ARCH_ABI),x86 x86_64)
+ifeq ($(TARGET_ARCH_ABI),x86)
+    LOCAL_CFLAGS    += -mssse3
+    LOCAL_CPPFLAGS  += -mssse3
+    LOCAL_CXXFLAGS  += -mssse3
+endif
+
+ifeq ($(TARGET_ARCH_ABI),x86_64)
     LOCAL_CFLAGS    += -mssse3
     LOCAL_CPPFLAGS  += -mssse3
     LOCAL_CXXFLAGS  += -mssse3

source/NEONvsSSE.h

@@ -44,11 +44,6 @@
 
 /*********************************************************************************************************************/
 //!!!!!!!!!!!!!!
-#ifndef USE_SSE4
-#if defined(__SSE4_2__)
-    #define USE_SSE4
-#endif
-#endif
 //if USE_SSE4 is defined, some functions use SSE4 instructions instead of earlier SSE versions, when undefined - SIMD up to SSSE3 are used
 //For older devices without SSE4 support it should be undefined,  for newer devices - defined, probably manualy if your compiler doesn't set __SSE4_2__ predefine
 /*********************************************************************************************************************/