Remove some redundant armv7 defines. Also, a stray QFile include.

Android.mk

@@ -108,7 +108,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ext $(LOCAL_PATH)/ext/libzip
 #Portable native and separate code on android in future is easy you needs add files 
 #by ($(target_arch_ABI),arquitecture (armeabi-v7a , armeabi , x86 , MIPS)
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A -DARMV7
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
     math/fast/fast_matrix_neon.S.neon \
     ext/libpng17/arm/arm_init.c \

image/zim_load.cpp

@@ -2,10 +2,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef USING_QT_UI
-#include <QFile>
-#endif
-
 #include "base/logging.h"
 #include "zlib.h"
 #include "image/zim_load.h"

math/fast/fast_math.c

@@ -3,7 +3,8 @@
 #include "fast_matrix.h"
 
 void InitFastMath(int enableNEON) {
-#if !defined(_M_IX86) && !defined(_M_X64) && defined(ARMEABI_V7A)
+// Every architecture has its own define. This needs to be added to.
+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7S__)
 	if (enableNEON) {
 		fast_matrix_mul_4x4 = &fast_matrix_mul_4x4_neon;
 	}