diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 015f3c8..43347a8 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -1003,7 +1003,7 @@
 aconfig_declarations {
     name: "libcore_aconfig_flags",
     package: "com.android.libcore",
-    container: "system",
+    container: "com.android.art",
     srcs: ["libcore.aconfig"],
 }
 
diff --git a/libcore.aconfig b/libcore.aconfig
index ca9f851..4fb3092 100644
--- a/libcore.aconfig
+++ b/libcore.aconfig
@@ -16,7 +16,7 @@
 # com.android is chosen as the java_aconfig_library is normally exposed to the platform,
 # but not public apps.
 package: "com.android.libcore"
-container: "system"
+container: "com.android.art"
 
 flag {
     namespace: "core_libraries"