diff --git a/build/android/Android.mk b/build/android/Android.mk
index 2abfb5eb0..8fa4c5555 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -183,33 +183,52 @@ LOCAL_CFLAGS += -DHAVE_CODEC2
 LOCAL_STATIC_LIBRARIES += libcodec2 libmscodec2
 endif
 
-ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00)
+ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)$(BUILD_ILBC),000)
 LOCAL_CFLAGS += -DHAVE_WEBRTC
 LOCAL_STATIC_LIBRARIES += libmswebrtc
 endif
+
 ifneq ($(BUILD_WEBRTC_AECM),0)
 LOCAL_STATIC_LIBRARIES += \
-	libwebrtc_aecm \
+	libwebrtc_aecm 
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_aecm_neon 
+endif
+endif
+
+
+ifneq ($(BUILD_WEBRTC_ISAC),0)
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_isacfix
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_isacfix_neon
+endif
+endif
+
+ifneq ($(BUILD_ILBC),0)
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_ilbc 
+endif
+
+
+ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)$(BUILD_ILBC),000)
+
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_apm_utility \
+	libwebrtc_system_wrappers \
 	libwebrtc_apm_utility \
 	libwebrtc_spl \
 	libwebrtc_system_wrappers
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
 LOCAL_STATIC_LIBRARIES += \
-	libwebrtc_aecm_neon \
-	libwebrtc_spl_neon
-endif
-endif
-ifneq ($(BUILD_WEBRTC_ISAC),0)
-LOCAL_STATIC_LIBRARIES += \
-	libwebrtc_isacfix \
-	libwebrtc_spl
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-LOCAL_STATIC_LIBRARIES += \
-	libwebrtc_isacfix_neon \
 	libwebrtc_spl_neon
 endif
+
 endif
 
+
 ifeq ($(BUILD_G729),1)
 LOCAL_CFLAGS += -DHAVE_G729
 LOCAL_STATIC_LIBRARIES += libbcg729 libmsbcg729
@@ -241,12 +260,6 @@ ifeq ($(BUILD_SRTP), 1)
 	LOCAL_C_INCLUDES += $(SRTP_C_INCLUDE)
 endif
 
-ifeq ($(BUILD_ILBC), 1)
-ifneq ($(TARGET_ARCH_ABI),armeabi)
-LOCAL_CFLAGS += -DHAVE_ILBC=1
-LOCAL_STATIC_LIBRARIES += libmsilbc
-endif
-endif
 
 LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES)
 LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)