diff --git a/app/src/main/jni/moonlight-core/Android.mk b/app/src/main/jni/moonlight-core/Android.mk
index c2d19296..376c1c86 100644
--- a/app/src/main/jni/moonlight-core/Android.mk
+++ b/app/src/main/jni/moonlight-core/Android.mk
@@ -20,8 +20,8 @@ LOCAL_SRC_FILES := moonlight-common-c/src/AudioStream.c \
                    moonlight-common-c/src/Platform.c \
                    moonlight-common-c/src/PlatformCrypto.c \
                    moonlight-common-c/src/PlatformSockets.c \
-                   moonlight-common-c/src/RtpFecQueue.c \
-                   moonlight-common-c/src/RtpReorderQueue.c \
+                   moonlight-common-c/src/RtpAudioQueue.c \
+                   moonlight-common-c/src/RtpVideoQueue.c \
                    moonlight-common-c/src/RtspConnection.c \
                    moonlight-common-c/src/RtspParser.c \
                    moonlight-common-c/src/SdpGenerator.c \
diff --git a/app/src/main/jni/moonlight-core/moonlight-common-c b/app/src/main/jni/moonlight-core/moonlight-common-c
index 4723f8ba..509a17db 160000
--- a/app/src/main/jni/moonlight-core/moonlight-common-c
+++ b/app/src/main/jni/moonlight-core/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 4723f8ba7cce9b2dead1d2d441472836153fa8ed
+Subproject commit 509a17dbc3522e2981c9e312f0a7721566f6c2b5