Merge branch 'master' of git://git.savannah.nongnu.org/linphone

diff --combined build/android/Android.mk
index 572e4c5e03b7debc8d736d8123f2a024314059b7,97ea6367376a2a4ddfac9fd19585a11fe30c3014..c7b48fde84125d77a111fc7c20d7446ee0bfe8cf
--- 1/build/android/Android.mk
--- 2/build/android/Android.mk
+++ b/build/android/Android.mk
@@@ -123,12 -123,13 +123,12 @@@ LOCAL_STATIC_LIBRARIES += libspee
  ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
  LOCAL_CFLAGS += -DHAVE_ILBC=1
  LOCAL_STATIC_LIBRARIES += libmsilbc
- LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES) 
  endif
  
+ LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES) 
  LOCAL_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
  LOCAL_SRC_FILES  += $(LIBLINPHONE_EXTENDED_SRC_FILES)
  
 -LOCAL_LDLIBS    += -lGLESv2
  ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
        LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
        ifeq ($(BUILD_GPLV3_ZRTP),1)