diff --git a/submodules/externals/build/speex/Android.mk b/submodules/externals/build/speex/Android.mk
index 1836b4f36..80fe4243b 100644
--- a/submodules/externals/build/speex/Android.mk
+++ b/submodules/externals/build/speex/Android.mk
@@ -87,7 +87,7 @@ ifeq ($(TARGET_ARCH),arm)
 			LOCAL_CFLAGS += $(FIXED_POINT_FLAGS)
 			LOCAL_CFLAGS += -DOVERRIDE_INTERPOLATE_PRODUCT_SINGLE -Dinterpolate_product_single=interpolate_product_single_int
 			ifeq ($(LINPHONE_VIDEO),1)
-				LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=ff_scalarproduct_int16_neon
+				LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=msresampler_scalarproduct_int16
 			endif
 		endif
 	else
diff --git a/submodules/linphone b/submodules/linphone
index c097b9ab6..391091cea 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit c097b9ab6319e2a7ef758032c0ed6d41e009bedb
+Subproject commit 391091cead70994de0c78fb4b9bc2b82d0cb98e0