diff --git a/.gitmodules b/.gitmodules
index 2df6164..6cc0f7d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,4 +9,4 @@
 	url = https://github.com/snake-4/aosp_fd_utils.git
 [submodule "module/jni/aosp_system_properties"]
 	path = module/jni/aosp_system_properties
-	url = https://github.com/snake-4/aosp_system_properties
+	url = https://github.com/topjohnwu/system_properties
diff --git a/module/jni/aosp_fd_utils b/module/jni/aosp_fd_utils
index 303bcb1..d20f15e 160000
--- a/module/jni/aosp_fd_utils
+++ b/module/jni/aosp_fd_utils
@@ -1 +1 @@
-Subproject commit 303bcb1577a22025e59d433bf5ac1c87ba429897
+Subproject commit d20f15efa07a76bdd6baf5da6e574f27ed6360e2
diff --git a/module/jni/aosp_system_properties b/module/jni/aosp_system_properties
index 8593306..cabe129 160000
--- a/module/jni/aosp_system_properties
+++ b/module/jni/aosp_system_properties
@@ -1 +1 @@
-Subproject commit 85933060d5338112119eabf0b845d6c6e046fe3e
+Subproject commit cabe129f5472ca10af82f3147fd8916d45b7d74e
diff --git a/module/jni/elfio b/module/jni/elfio
index 45af83b..41f4012 160000
--- a/module/jni/elfio
+++ b/module/jni/elfio
@@ -1 +1 @@
-Subproject commit 45af83bc6729431a65bfb7937b3ae8dce0de39c4
+Subproject commit 41f4012d494027a1710593baa467f91fa09be32f