diff --git a/submodules/externals/build/speex/Android.mk b/submodules/externals/build/speex/Android.mk
index e77ef1493..0e9652909 100644
--- a/submodules/externals/build/speex/Android.mk
+++ b/submodules/externals/build/speex/Android.mk
@@ -66,13 +66,18 @@ LOCAL_SRC_FILES := \
 	$(libspeexdsp_SRC_FILES)
 
 #	-DARM4_ASM 
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ARMV7_USE_FLOAT=1
+endif
+
 ifeq ($(TARGET_ARCH),arm)
-	ifeq ($(LINPHONE_VIDEO),1)
-		LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=ff_scalarproduct_float_neon
-	endif	
-	ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+	ifeq ($(ARMV7_USE_FLOAT),1)
 		LOCAL_CFLAGS += -DFLOATING_POINT=1 
 		LOCAL_CFLAGS += -DOVERRIDE_INTERPOLATE_PRODUCT_SINGLE
+		ifeq ($(LINPHONE_VIDEO),1)
+			LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=ff_scalarproduct_float_neon
+		endif	
 	else 
 		LOCAL_CFLAGS +=\
 			-DARM5E_ASM\
diff --git a/submodules/msx264 b/submodules/msx264
index e9852e6e8..db564c370 160000
--- a/submodules/msx264
+++ b/submodules/msx264
@@ -1 +1 @@
-Subproject commit e9852e6e87809242ad126fc776fa1373673ab7f2
+Subproject commit db564c3707c1d36edf48a17c0e3bc647b63b6b04