diff --git a/app/build.gradle b/app/build.gradle
index 6cb634fa..90bc5659 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,17 +38,10 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
 
-    // These lines are required to avoid dexing issues with the BouncyCastle library
-    // bundled with limelight-common.jar
-    packagingOptions {
-        exclude 'META-INF/BCKEY.SF'
-        exclude 'META-INF/BCKEY.DSA'
-    }
-
     externalNativeBuild {
         ndkBuild {
             path "src/main/jni/Android.mk"
@@ -59,10 +52,6 @@ android {
 dependencies {
     compile 'org.bouncycastle:bcprov-jdk15on:1.52'
     compile 'org.bouncycastle:bcpkix-jdk15on:1.52'
-    compile 'com.squareup.okhttp:okhttp:2.4.0'
-    compile 'com.squareup.okio:okio:1.5.0'
-    compile files('libs/jmdns-3.4.2.jar')
-    compile files('libs/limelight-common.jar')
-    compile files('libs/tinyrtsp.jar')
+    compile project(':moonlight-common')
     compile files('libs/jcodec-0.1.9-patched.jar')
 }
diff --git a/app/libs/jmdns-3.4.2.jar b/app/libs/jmdns-3.4.2.jar
deleted file mode 100644
index 3112053f..00000000
Binary files a/app/libs/jmdns-3.4.2.jar and /dev/null differ
diff --git a/app/libs/limelight-common.jar b/app/libs/limelight-common.jar
deleted file mode 100644
index a4ae5f99..00000000
Binary files a/app/libs/limelight-common.jar and /dev/null differ
diff --git a/app/libs/tinyrtsp.jar b/app/libs/tinyrtsp.jar
deleted file mode 100644
index 73375ae2..00000000
Binary files a/app/libs/tinyrtsp.jar and /dev/null differ
diff --git a/moonlight-common b/moonlight-common
index 9b3102e8..03b88230 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit 9b3102e8fbfb6e654a51b20d278ddc3574c3571d
+Subproject commit 03b88230fa489eefd8de809ff12803125baa0edd
diff --git a/settings.gradle b/settings.gradle
index e7b4def4..c6a62006 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':moonlight-common'