libril: Make ST-E Thor M7450 and Intel XMM7260 next gen modems as well

Change-Id: I7cacda8cdaf9e285688c06c42ccf6629efc2af9d
diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index c31b382..c5e1c5e 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -28,16 +28,14 @@
 ifeq ($(BOARD_MODEM_TYPE),xmm6260)
 LOCAL_CFLAGS := -DMODEM_TYPE_XMM6260
 endif
-ifeq ($(BOARD_MODEM_TYPE),xmm7260)
-LOCAL_CFLAGS := -DMODEM_TYPE_XMM7260
-endif
-ifeq ($(BOARD_MODEM_TYPE),m7450)
-LOCAL_CFLAGS := -DMODEM_TYPE_M7450
-endif
-ifneq ($(filter ss333 mdm9x35,$(BOARD_MODEM_TYPE)),)
+ifneq ($(filter m7450 mdm9x35 ss333 xmm7260,$(BOARD_MODEM_TYPE)),)
 LOCAL_CFLAGS := -DSAMSUNG_NEXT_GEN_MODEM
 endif
 
+ifneq ($(filter m7450 xmm7260,$(BOARD_MODEM_TYPE)),)
+LOCAL_CFLAGS += -DNEEDS_VIDEO_CALL_FIELD
+endif
+
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADER)/librilutils
 LOCAL_C_INCLUDES += external/nanopb-c