diff --git a/build.gradle b/build.gradle
index 97d43c4d..9cc69b54 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0-rc03'
     }
 }
 
diff --git a/moonlight-common b/moonlight-common
index 9ef3a4a6..7f95544a 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit 9ef3a4a6b7fb1d687d1efb0fae1be5378e6abbdb
+Subproject commit 7f95544a0d30c20b1a1e1f3e2718082bdbc2da8e