diff --git a/Android.bp b/Android.bp
index 1023b4818bb74..190e80d85a284 100644
--- a/Android.bp
+++ b/Android.bp
@@ -720,9 +720,6 @@ java_defaults {
         "core/java/com/android/server/DropboxLogTags.logtags",
         "core/java/org/chromium/arc/EventLogTags.logtags",
 
-        ":apex-properties",
-        ":platform-properties",
-
         ":framework-statslog-gen",
     ],
 
@@ -790,6 +787,9 @@ java_defaults {
         "android.hardware.vibrator-V1.3-java",
         "android.hardware.wifi-V1.0-java-constants",
         "devicepolicyprotosnano",
+
+        "com.android.sysprop.apex",
+        "PlatformProperties",
     ],
 
     required: [