diff --git a/build/android/Android.mk b/build/android/Android.mk
index 8c64fae8a..4f4e9954d 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -105,7 +105,7 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../../externals/libxml2/include \
 	$(LOCAL_PATH)/../../externals/build/libxml2
 
-LOCAL_LDLIBS += -llog -ldl
+LOCAL_LDLIBS += -llog -lOpenSLES -ldl
 
 LOCAL_STATIC_LIBRARIES := \
 	cpufeatures \
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
index c41ca2933..f7178b63c 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
@@ -20,24 +20,24 @@ package org.linphone.core.tutorials;
 
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCallStats;
 import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneContent;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
+import org.linphone.core.LinphoneCore.GlobalState;
+import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneFriend.SubscribePolicy;
 import org.linphone.core.LinphoneInfoMessage;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.OnlineStatus;
-import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneCore.GlobalState;
-import org.linphone.core.LinphoneCore.RegistrationState;
-import org.linphone.core.LinphoneFriend.SubscribePolicy;
 import org.linphone.core.PublishState;
 import org.linphone.core.SubscriptionState;
 
@@ -140,7 +140,7 @@ public class TutorialBuddyStatus implements LinphoneCoreListener {
 
 		// First instantiate the core Linphone object given only a listener.
 		// The listener will react to events in Linphone core.
-		LinphoneCore lc = lcFactory.createLinphoneCore(this);
+		LinphoneCore lc = lcFactory.createLinphoneCore(this, null);
 
 
 		try {
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
index 3278c990d..fc5e9dccc 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
@@ -116,7 +116,7 @@ public class TutorialChatRoom implements LinphoneCoreListener, LinphoneChatMessa
 		
 		// First instantiate the core Linphone object given only a listener.
 		// The listener will react to events in Linphone core.
-		LinphoneCore lc = LinphoneCoreFactory.instance().createLinphoneCore(this);
+		LinphoneCore lc = LinphoneCoreFactory.instance().createLinphoneCore(this, null);
 
 		try {
 			// Next step is to create a chat room
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
index 763e18f12..e6761da97 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
@@ -113,7 +113,7 @@ public class TutorialHelloWorld implements LinphoneCoreListener {
 		
 		// First instantiate the core Linphone object given only a listener.
 		// The listener will react to events in Linphone core.
-		LinphoneCore lc = LinphoneCoreFactory.instance().createLinphoneCore(this);
+		LinphoneCore lc = LinphoneCoreFactory.instance().createLinphoneCore(this, null);
 
 
 		
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
index 8384ed16e..7e6d8a002 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
@@ -118,7 +118,7 @@ public class TutorialRegistration implements LinphoneCoreListener {
 
 		// First instantiate the core Linphone object given only a listener.
 		// The listener will react to events in Linphone core.
-		LinphoneCore lc = lcFactory.createLinphoneCore(this);
+		LinphoneCore lc = lcFactory.createLinphoneCore(this, null);
 
 	
 		try {
diff --git a/java/common/org/linphone/core/LinphoneCoreFactory.java b/java/common/org/linphone/core/LinphoneCoreFactory.java
index 95cfdeaf0..f394dbb4e 100644
--- a/java/common/org/linphone/core/LinphoneCoreFactory.java
+++ b/java/common/org/linphone/core/LinphoneCoreFactory.java
@@ -22,6 +22,7 @@ package org.linphone.core;
 
 
 
+
 abstract public class LinphoneCoreFactory {
 	
 	private static String factoryName = "org.linphone.core.LinphoneCoreFactoryImpl";
@@ -65,8 +66,8 @@ abstract public class LinphoneCoreFactory {
 	 * */
 	abstract public LinphoneAuthInfo createAuthInfo(String username, String userid, String passwd, String ha1, String realm, String domain);
 	
-	abstract public LinphoneCore createLinphoneCore(LinphoneCoreListener listener, String userConfig,String factoryConfig,Object  userdata) throws LinphoneCoreException;
-	abstract public LinphoneCore createLinphoneCore(LinphoneCoreListener listener) throws LinphoneCoreException;
+	abstract public LinphoneCore createLinphoneCore(LinphoneCoreListener listener, String userConfig,String factoryConfig,Object  userdata, Object context) throws LinphoneCoreException;
+	abstract public LinphoneCore createLinphoneCore(LinphoneCoreListener listener, Object context) throws LinphoneCoreException;
 
 
 	/**
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index e526b47b5..521a3d6b1 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -21,6 +21,7 @@ package org.linphone.core;
 import java.io.File;
 import java.io.IOException;
 
+import org.linphone.mediastream.MediastreamerAndroidContext;
 import org.linphone.mediastream.Version;
 
 import android.util.Log;
@@ -94,9 +95,10 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 
 	@Override
 	public LinphoneCore createLinphoneCore(LinphoneCoreListener listener,
-			String userConfig, String factoryConfig, Object userdata)
+			String userConfig, String factoryConfig, Object userdata, Object context)
 			throws LinphoneCoreException {
 		try {
+			MediastreamerAndroidContext.setContext(context);
 			File user = userConfig == null ? null : new File(userConfig);
 			File factory = factoryConfig == null ? null : new File(factoryConfig);
 			return new LinphoneCoreImpl(listener, user, factory, userdata);
@@ -106,8 +108,9 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 	}
 
 	@Override
-	public LinphoneCore createLinphoneCore(LinphoneCoreListener listener) throws LinphoneCoreException {
+	public LinphoneCore createLinphoneCore(LinphoneCoreListener listener, Object context) throws LinphoneCoreException {
 		try {
+			MediastreamerAndroidContext.setContext(context);
 			return new LinphoneCoreImpl(listener);
 		} catch (IOException e) {
 			throw new LinphoneCoreException("Cannot create LinphoneCore",e);
diff --git a/mediastreamer2 b/mediastreamer2
index 184cca52e..1283fad5a 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 184cca52e9816d02b1a3e94619e71547458481e8
+Subproject commit 1283fad5a14aaa14343206d96ba4133694349b3e