diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 2e5c4cf59..948f88e3f 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -21,7 +21,7 @@ package org.linphone.core;
 import java.io.File;
 import java.io.IOException;
 
-import org.linphone.CpuUtils;
+import org.linphone.mediastream.CpuUtils;
 import org.linphone.mediastream.Version;
 
 import android.util.Log;
diff --git a/mediastreamer2 b/mediastreamer2
index 8d85a5ded..81dd82dc6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 8d85a5ded3b18e2d3d4ba22ee75e0f1ef9c0f739
+Subproject commit 81dd82dc688b0f3e5d3f4d6783a64d04240c35ca