diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index d129a7106..fb063aef6 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -161,5 +161,4 @@ endif
 # Libraries
 ########################
 include jni/utils/Android.mk
-include jni/systemproperties/Android.mk
 include jni/external/Android.mk
diff --git a/native/jni/external/Android.mk b/native/jni/external/Android.mk
index b9db72b79..ebad88bd9 100644
--- a/native/jni/external/Android.mk
+++ b/native/jni/external/Android.mk
@@ -353,4 +353,6 @@ LOCAL_SRC_FILES := \
     pcre/dist2/src/pcre2_xclass.c
 include $(BUILD_STATIC_LIBRARY)
 
-include $(LOCAL_PATH)/mincrypt/Android.mk
+CWD := $(LOCAL_PATH)
+include $(CWD)/systemproperties/Android.mk
+include $(CWD)/mincrypt/Android.mk
diff --git a/native/jni/systemproperties/Android.mk b/native/jni/external/systemproperties/Android.mk
similarity index 100%
rename from native/jni/systemproperties/Android.mk
rename to native/jni/external/systemproperties/Android.mk
diff --git a/native/jni/systemproperties/context_node.cpp b/native/jni/external/systemproperties/context_node.cpp
similarity index 100%
rename from native/jni/systemproperties/context_node.cpp
rename to native/jni/external/systemproperties/context_node.cpp
diff --git a/native/jni/systemproperties/contexts_serialized.cpp b/native/jni/external/systemproperties/contexts_serialized.cpp
similarity index 100%
rename from native/jni/systemproperties/contexts_serialized.cpp
rename to native/jni/external/systemproperties/contexts_serialized.cpp
diff --git a/native/jni/systemproperties/contexts_split.cpp b/native/jni/external/systemproperties/contexts_split.cpp
similarity index 100%
rename from native/jni/systemproperties/contexts_split.cpp
rename to native/jni/external/systemproperties/contexts_split.cpp
diff --git a/native/jni/systemproperties/include/_system_properties.h b/native/jni/external/systemproperties/include/_system_properties.h
similarity index 100%
rename from native/jni/systemproperties/include/_system_properties.h
rename to native/jni/external/systemproperties/include/_system_properties.h
diff --git a/native/jni/systemproperties/include/async_safe/log.h b/native/jni/external/systemproperties/include/async_safe/log.h
similarity index 100%
rename from native/jni/systemproperties/include/async_safe/log.h
rename to native/jni/external/systemproperties/include/async_safe/log.h
diff --git a/native/jni/systemproperties/include/private/ErrnoRestorer.h b/native/jni/external/systemproperties/include/private/ErrnoRestorer.h
similarity index 100%
rename from native/jni/systemproperties/include/private/ErrnoRestorer.h
rename to native/jni/external/systemproperties/include/private/ErrnoRestorer.h
diff --git a/native/jni/systemproperties/include/private/bionic_defs.h b/native/jni/external/systemproperties/include/private/bionic_defs.h
similarity index 100%
rename from native/jni/systemproperties/include/private/bionic_defs.h
rename to native/jni/external/systemproperties/include/private/bionic_defs.h
diff --git a/native/jni/systemproperties/include/private/bionic_futex.h b/native/jni/external/systemproperties/include/private/bionic_futex.h
similarity index 100%
rename from native/jni/systemproperties/include/private/bionic_futex.h
rename to native/jni/external/systemproperties/include/private/bionic_futex.h
diff --git a/native/jni/systemproperties/include/private/bionic_lock.h b/native/jni/external/systemproperties/include/private/bionic_lock.h
similarity index 100%
rename from native/jni/systemproperties/include/private/bionic_lock.h
rename to native/jni/external/systemproperties/include/private/bionic_lock.h
diff --git a/native/jni/systemproperties/include/private/bionic_macros.h b/native/jni/external/systemproperties/include/private/bionic_macros.h
similarity index 100%
rename from native/jni/systemproperties/include/private/bionic_macros.h
rename to native/jni/external/systemproperties/include/private/bionic_macros.h
diff --git a/native/jni/systemproperties/include/private/hacks.h b/native/jni/external/systemproperties/include/private/hacks.h
similarity index 100%
rename from native/jni/systemproperties/include/private/hacks.h
rename to native/jni/external/systemproperties/include/private/hacks.h
diff --git a/native/jni/systemproperties/include/property_info_parser/property_info_parser.h b/native/jni/external/systemproperties/include/property_info_parser/property_info_parser.h
similarity index 100%
rename from native/jni/systemproperties/include/property_info_parser/property_info_parser.h
rename to native/jni/external/systemproperties/include/property_info_parser/property_info_parser.h
diff --git a/native/jni/systemproperties/include/system_properties.h b/native/jni/external/systemproperties/include/system_properties.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties.h
rename to native/jni/external/systemproperties/include/system_properties.h
diff --git a/native/jni/systemproperties/include/system_properties/context_node.h b/native/jni/external/systemproperties/include/system_properties/context_node.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties/context_node.h
rename to native/jni/external/systemproperties/include/system_properties/context_node.h
diff --git a/native/jni/systemproperties/include/system_properties/contexts.h b/native/jni/external/systemproperties/include/system_properties/contexts.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties/contexts.h
rename to native/jni/external/systemproperties/include/system_properties/contexts.h
diff --git a/native/jni/systemproperties/include/system_properties/contexts_pre_split.h b/native/jni/external/systemproperties/include/system_properties/contexts_pre_split.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties/contexts_pre_split.h
rename to native/jni/external/systemproperties/include/system_properties/contexts_pre_split.h
diff --git a/native/jni/systemproperties/include/system_properties/contexts_serialized.h b/native/jni/external/systemproperties/include/system_properties/contexts_serialized.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties/contexts_serialized.h
rename to native/jni/external/systemproperties/include/system_properties/contexts_serialized.h
diff --git a/native/jni/systemproperties/include/system_properties/contexts_split.h b/native/jni/external/systemproperties/include/system_properties/contexts_split.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties/contexts_split.h
rename to native/jni/external/systemproperties/include/system_properties/contexts_split.h
diff --git a/native/jni/systemproperties/include/system_properties/prop_area.h b/native/jni/external/systemproperties/include/system_properties/prop_area.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties/prop_area.h
rename to native/jni/external/systemproperties/include/system_properties/prop_area.h
diff --git a/native/jni/systemproperties/include/system_properties/prop_info.h b/native/jni/external/systemproperties/include/system_properties/prop_info.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties/prop_info.h
rename to native/jni/external/systemproperties/include/system_properties/prop_info.h
diff --git a/native/jni/systemproperties/include/system_properties/system_properties.h b/native/jni/external/systemproperties/include/system_properties/system_properties.h
similarity index 100%
rename from native/jni/systemproperties/include/system_properties/system_properties.h
rename to native/jni/external/systemproperties/include/system_properties/system_properties.h
diff --git a/native/jni/systemproperties/prop_area.cpp b/native/jni/external/systemproperties/prop_area.cpp
similarity index 100%
rename from native/jni/systemproperties/prop_area.cpp
rename to native/jni/external/systemproperties/prop_area.cpp
diff --git a/native/jni/systemproperties/prop_info.cpp b/native/jni/external/systemproperties/prop_info.cpp
similarity index 100%
rename from native/jni/systemproperties/prop_info.cpp
rename to native/jni/external/systemproperties/prop_info.cpp
diff --git a/native/jni/systemproperties/property_info_parser.cpp b/native/jni/external/systemproperties/property_info_parser.cpp
similarity index 100%
rename from native/jni/systemproperties/property_info_parser.cpp
rename to native/jni/external/systemproperties/property_info_parser.cpp
diff --git a/native/jni/systemproperties/system_properties.cpp b/native/jni/external/systemproperties/system_properties.cpp
similarity index 100%
rename from native/jni/systemproperties/system_properties.cpp
rename to native/jni/external/systemproperties/system_properties.cpp
diff --git a/native/jni/systemproperties/system_property_api.cpp b/native/jni/external/systemproperties/system_property_api.cpp
similarity index 100%
rename from native/jni/systemproperties/system_property_api.cpp
rename to native/jni/external/systemproperties/system_property_api.cpp
diff --git a/native/jni/systemproperties/system_property_set.cpp b/native/jni/external/systemproperties/system_property_set.cpp
similarity index 100%
rename from native/jni/systemproperties/system_property_set.cpp
rename to native/jni/external/systemproperties/system_property_set.cpp