diff --git a/core/main.mk b/core/main.mk
index 5c280da1a2..8d0b465e0a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -305,6 +305,9 @@ endif
 
 $(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] finishing legacy Make module parsing ...)
 
+# Create necessary directories and symlinks in the root filesystem
+include system/core/rootdir/create_root_structure.mk
+
 # -------------------------------------------------------------------
 # All module makefiles have been included at this point.
 # -------------------------------------------------------------------
diff --git a/core/tasks/meta-lic.mk b/core/tasks/meta-lic.mk
index 24adfc827f..620b1e29ae 100644
--- a/core/tasks/meta-lic.mk
+++ b/core/tasks/meta-lic.mk
@@ -225,3 +225,6 @@ $(eval $(call declare-1p-copy-files,packages/services/Car,))
 
 # Moved here from hardware/libhardware_legacy/Android.mk
 $(eval $(call declare-1p-copy-files,hardware/libhardware_legacy,))
+
+# Moved here from system/core/rootdir/Android.mk
+$(eval $(call declare-1p-copy-files,system/core/rootdir,))