diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 4b69660..89b6fc5 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -289,9 +289,11 @@
         "libz",
     ],
     data: [
-        ":com.android.virt",
         ":test.com.android.virt.pem",
     ],
+    device_common_data: [
+        ":com.android.virt",
+    ],
     test_suites: ["general-tests"],
 }