diff --git a/app/build.gradle b/app/build.gradle
index 1c869dca..0a4f504e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,19 +24,11 @@ android {
             maxSdkVersion 25
 
             applicationId "com.limelight.root"
-            ndk {
-                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
-            }
-
             dimension "root"
         }
 
         nonRoot {
             applicationId "com.limelight"
-            ndk {
-                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
-            }
-
             dimension "root"
         }
     }
diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
index c6a99944..32615607 100644
--- a/app/src/main/jni/Application.mk
+++ b/app/src/main/jni/Application.mk
@@ -1,10 +1,4 @@
-# Application.mk for Limelight
+# Application.mk for Moonlight
 
 # Our minimum version is Android 4.1
 APP_PLATFORM := android-16
-
-# Support all modern ABIs
-APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
-
-# We want an optimized build
-APP_OPTIM := release
diff --git a/moonlight-common b/moonlight-common
index 0f31a318..26235fdd 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit 0f31a318e5a74cc452c04d0354341172ab3647b5
+Subproject commit 26235fdd504df956d02e39135cd0f0e6e5d496d2