diff --git a/build/android/Android.mk b/build/android/Android.mk
index 066f36069..1c7a611bf 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -122,12 +122,13 @@ LOCAL_STATIC_LIBRARIES += libspeex
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_CFLAGS += -DHAVE_ILBC=1
 LOCAL_STATIC_LIBRARIES += libmsilbc
-else
-LOCAL_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
-LOCAL_SRC_FILES  += $(LIBLINPHONE_EXTENDED_SRC_FILES)
 LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES) 
 endif
 
+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)
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 346fdfa72..457a7c34a 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -186,18 +186,21 @@ public interface LinphoneCore {
 	static public class EcCalibratorStatus {
 		@SuppressWarnings("unchecked")
 		static private Vector values = new Vector();
+		public static final int IN_PROGRESS_STATUS=0;
+		public static final int DONE_STATUS=1;
+		public static final int FAILED_STATUS=2;
 		/**
 		 * Calibration in progress
 		 */
-		static public EcCalibratorStatus InProgress = new EcCalibratorStatus(0,"InProgress");       
+		static public EcCalibratorStatus InProgress = new EcCalibratorStatus(IN_PROGRESS_STATUS,"InProgress");       
 		/**
 		 * Calibration done
 		 */
-		static public EcCalibratorStatus Done  = new EcCalibratorStatus(1,"Done");
+		static public EcCalibratorStatus Done  = new EcCalibratorStatus(DONE_STATUS,"Done");
 		/**
 		 * Calibration in progress
 		 */
-		static public EcCalibratorStatus Failed = new EcCalibratorStatus(2,"Failed");
+		static public EcCalibratorStatus Failed = new EcCalibratorStatus(FAILED_STATUS,"Failed");
 
 		private final int mValue;
 		private final String mStringValue;