Remove dependencies on the 1-variant fallback

When adding a dependencies, if the variants don't match, but the
dependency only has 1 variant anyways, soong will always use that
variant. This makes it hard to add new variants to soong, because the
1-variant fallback stops being used and you start getting missing
variant errors. Make changes to bp files such that all dependencies
correctly specify the variant to use.

Bug: 372091092
Flag: EXEMPT refactor
Test: m nothing
Change-Id: I9cc72bb9a769e0c96e3a5c1fff005f8ad8556ff2

20 files changed, 2554 insertions, 370 deletions

diff --git a/artd/Android.bp b/artd/Android.bp
index ea4de5219f..2aad3a7c72 100644
--- a/artd/Android.bp
+++ b/artd/Android.bp
@@ -83,7 +83,7 @@ art_cc_defaults {
         "file_utils_test.cc",
         "path_utils_test.cc",
     ],
-    data: [
+    device_common_data: [
         ":art-gtest-jars-Main",
         ":art-gtest-jars-Nested",
     ],
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index db75d7c640..43423f35e6 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -386,10 +386,12 @@ cc_defaults {
     },
 }
 
-genrule {
+java_genrule {
     name: "art-check-release-apex-gen",
+    host_supported: true,
+    device_supported: false,
     defaults: ["art-check-apex-gen-defaults"],
-    srcs: [":com.android.art"],
+    device_common_srcs: [":com.android.art"],
     cmd: art_check_apex_gen_stem +
         " --flavor release" +
         " $(in)" +
@@ -404,10 +406,12 @@ cc_prebuilt_binary {
     srcs: [":art-check-release-apex-gen"],
 }
 
-genrule {
+java_genrule {
     name: "art-check-debug-apex-gen",
+    host_supported: true,
+    device_supported: false,
     defaults: ["art-check-apex-gen-defaults"],
-    srcs: [":com.android.art.debug"],
+    device_common_srcs: [":com.android.art.debug"],
     cmd: art_check_apex_gen_stem +
         " --flavor debug" +
         " $(in)" +
@@ -422,10 +426,12 @@ cc_prebuilt_binary {
     srcs: [":art-check-debug-apex-gen"],
 }
 
-genrule {
+java_genrule {
     name: "art-check-testing-apex-gen",
+    host_supported: true,
+    device_supported: false,
     defaults: ["art-check-apex-gen-defaults"],
-    srcs: [":com.android.art.testing"],
+    device_common_srcs: [":com.android.art.testing"],
     cmd: art_check_apex_gen_stem +
         " --flavor testing" +
         " $(in)" +
@@ -440,26 +446,16 @@ cc_prebuilt_binary {
     srcs: [":art-check-testing-apex-gen"],
 }
 
-// sdk module types have 3 (maybe 4 for windows?) variants: linux, android, and common_os.
-// common_os depends on the linux/android variants and packages their artifacts into a zip file.
-// We want access to that zip file in art_release_zip, so we need to depend on only the common_os
-// variant of art-module-host-exports, which is what sdk_genrule does. Since sdk_genrule only has
-// 1 variant, we can then depend on it from a different type of genrule like regular genrule.
-sdk_genrule {
-    name: "art-module-host-exports-for-genrule",
-    srcs: [":art-module-host-exports"],
-    out: ["art-module-host-exports-current.zip"],
-    cmd: "cp $(in) $(out)",
-}
-
 // A zip containing ART binaries and ART bootclasspath jars.
 // At the time of writing, this is only for Compiler Explorer (https://godbolt.org).
-genrule {
+java_genrule {
     name: "art_release_zip",
     srcs: [
-        ":art-module-host-exports-for-genrule",
         ":com.android.art",
     ],
+    common_os_srcs: [
+        ":art-module-host-exports",
+    ],
     out: [
         "art_release.zip",
     ],
@@ -482,7 +478,7 @@ genrule {
         "-f $(genDir)/extracted/javalib/bouncycastle.jar " +
         "-f $(genDir)/extracted/javalib/apache-xml.jar && " +
 
-        "$(location merge_zips) $(out) $(out).tmp $(location :art-module-host-exports-for-genrule)",
+        "$(location merge_zips) $(out) $(out).tmp $(location :art-module-host-exports)",
     dist: {
         targets: ["droidcore"],
     },
diff --git a/compiler/Android.bp b/compiler/Android.bp
index ece67d4290..370c0b8028 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -438,7 +438,7 @@ art_cc_library_static {
 
 art_cc_defaults {
     name: "art_compiler_tests_defaults",
-    data: [
+    device_common_data: [
         ":art-gtest-jars-ExceptionHandle",
         ":art-gtest-jars-Interfaces",
         ":art-gtest-jars-Main",
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 093e0c55e3..3814a50da8 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -426,7 +426,7 @@ art_cc_library_static {
 
 art_cc_defaults {
     name: "art_dex2oat_tests_defaults",
-    data: [
+    device_common_data: [
         ":art-gtest-jars-AbstractMethod",
         ":art-gtest-jars-ArrayClassWithUnresolvedComponent",
         ":art-gtest-jars-DefaultMethods",
diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp
index 62a0003204..76d879f1cf 100644
--- a/dexoptanalyzer/Android.bp
+++ b/dexoptanalyzer/Android.bp
@@ -87,7 +87,7 @@ art_cc_defaults {
     defaults: [
         "art_libunwindstack_static_defaults", // Must be statically linked in standalone tests
     ],
-    data: [
+    device_common_data: [
         ":art-gtest-jars-LinkageTest",
         ":art-gtest-jars-Main",
         ":art-gtest-jars-MainStripped",
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index b9320b7dae..a7eb1230ba 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -309,7 +309,7 @@ art_cc_defaults {
         "dex/type_lookup_table_test.cc",
         "dex/utf_test.cc",
     ],
-    data: [
+    device_common_data: [
         ":art-gtest-jars-GetMethodSignature",
         ":art-gtest-jars-Lookup",
         ":art-gtest-jars-Main",
diff --git a/libnativeloader/test/Android.bp b/libnativeloader/test/Android.bp
index 4396917a57..c656fd7477 100644
--- a/libnativeloader/test/Android.bp
+++ b/libnativeloader/test/Android.bp
@@ -191,7 +191,7 @@ java_test_host {
         "compatibility-tradefed",
         "tradefed",
     ],
-    data: [
+    device_common_data: [
         ":library_container_app",
         ":libnativeloader_system_shared_lib",
         ":libnativeloader_system_ext_shared_lib",
diff --git a/libprofile/Android.bp b/libprofile/Android.bp
index ced2166957..0d1e5f7fa7 100644
--- a/libprofile/Android.bp
+++ b/libprofile/Android.bp
@@ -180,7 +180,7 @@ art_cc_library {
 // TODO: Remove CommonRuntimeTest dependency from these tests.
 art_cc_defaults {
     name: "art_libprofile_tests_defaults",
-    data: [
+    device_common_data: [
         ":art-gtest-jars-ManyMethods",
         ":art-gtest-jars-MultiDex",
         ":art-gtest-jars-ProfileTestMultiDex",
diff --git a/oatdump/Android.bp b/oatdump/Android.bp
index ce233f8d10..024d06eeaf 100644
--- a/oatdump/Android.bp
+++ b/oatdump/Android.bp
@@ -193,7 +193,7 @@ art_cc_binary {
 
 art_cc_defaults {
     name: "art_oatdump_tests_defaults",
-    data: [
+    device_common_data: [
         ":art-gtest-jars-ProfileTestMultiDex",
     ],
     srcs: [
diff --git a/profman/Android.bp b/profman/Android.bp
index 948b6fd23d..623033cd40 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -185,7 +185,7 @@ cc_library_headers {
 
 art_cc_defaults {
     name: "art_profman_tests_defaults",
-    data: [
+    device_common_data: [
         ":art-gtest-jars-ProfileTestMultiDex",
     ],
     header_libs: ["profman_headers"],
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 079e7d1185..aaaa7251fb 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -990,7 +990,7 @@ art_cc_defaults {
             ],
         },
     },
-    data: [
+    device_common_data: [
         ":art-gtest-jars-AllFields",
         ":art-gtest-jars-DexVerificationFuzzerFolder",
         ":art-gtest-jars-ClassVerificationFuzzerFolder",
diff --git a/test/Android.bp b/test/Android.bp
index 2a0bf12fef..784c45a377 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -1381,7 +1381,7 @@ csuite_test {
 
 filegroup {
     name: "art-gtest-jars",
-    srcs: [
+    device_common_srcs: [
         ":art-gtest-jars-AbstractMethod",
         ":art-gtest-jars-AllFields",
         ":art-gtest-jars-ArrayClassWithUnresolvedComponent",
@@ -1720,7 +1720,7 @@ genrule_defaults {
 }
 
 // A copy of Main with the classes.dex stripped for the oat file assistant tests.
-genrule {
+java_genrule {
     name: "art-gtest-jars-MainStripped",
     srcs: [":art-gtest-jars-Main"],
     cmd: "$(location zip2zip) -i $(in) -o $(out) -x 'classes*.dex'",
@@ -1729,7 +1729,7 @@ genrule {
 }
 
 // An empty.dex that is empty and uncompressed for the dex2oat tests.
-genrule {
+java_genrule {
     name: "art-gtest-jars-MainEmptyUncompressed",
     srcs: ["Main/empty.dex"],
     cmd: "$(location soong_zip) -j -L 0 -o $(out) -f $(in)",
@@ -1738,7 +1738,7 @@ genrule {
 }
 
 // An empty.dex that is empty and uncompressed and aligned for the dex2oat tests.
-genrule {
+java_genrule {
     name: "art-gtest-jars-MainEmptyUncompressedAligned",
     defaults: ["art-gtest-jars-align-defaults"],
     srcs: [":art-gtest-jars-MainEmptyUncompressed"],
@@ -1746,7 +1746,7 @@ genrule {
 }
 
 // A copy of Main with the classes.dex uncompressed for the dex2oat tests.
-genrule {
+java_genrule {
     name: "art-gtest-jars-MainUncompressed",
     defaults: ["art-gtest-jars-uncompress-defaults"],
     srcs: [":art-gtest-jars-Main"],
@@ -1754,7 +1754,7 @@ genrule {
 }
 
 // A copy of Main with the classes.dex uncompressed and aligned for the dex2oat tests.
-genrule {
+java_genrule {
     name: "art-gtest-jars-MainUncompressedAligned",
     defaults: ["art-gtest-jars-align-defaults"],
     srcs: [":art-gtest-jars-MainUncompressed"],
@@ -1773,7 +1773,7 @@ java_library {
 }
 
 // A copy of MultiDex with the classes.dex uncompressed for the OatFile tests.
-genrule {
+java_genrule {
     name: "art-gtest-jars-MultiDexUncompressed",
     defaults: ["art-gtest-jars-uncompress-defaults"],
     srcs: [":art-gtest-jars-MultiDex"],
@@ -1781,7 +1781,7 @@ genrule {
 }
 
 // A copy of MultiDex with the classes.dex uncompressed and aligned for the OatFile tests.
-genrule {
+java_genrule {
     name: "art-gtest-jars-MultiDexUncompressedAligned",
     defaults: ["art-gtest-jars-align-defaults"],
     srcs: [":art-gtest-jars-MultiDexUncompressed"],
diff --git a/test/Android.run-test.bp b/test/Android.run-test.bp
index 4bbeb4a1b7..25594ffbd8 100644
--- a/test/Android.run-test.bp
+++ b/test/Android.run-test.bp
@@ -21,10 +21,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard00-fg",
+    device_common_srcs: [":art-run-test-host-data-shard00-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard00",
-    src: ":art-run-test-host-data-shard00-tmp",
+    src: ":art-run-test-host-data-shard00-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard00.zip",
 }
@@ -40,10 +47,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard01-fg",
+    device_common_srcs: [":art-run-test-host-data-shard01-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard01",
-    src: ":art-run-test-host-data-shard01-tmp",
+    src: ":art-run-test-host-data-shard01-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard01.zip",
 }
@@ -59,10 +73,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard02-fg",
+    device_common_srcs: [":art-run-test-host-data-shard02-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard02",
-    src: ":art-run-test-host-data-shard02-tmp",
+    src: ":art-run-test-host-data-shard02-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard02.zip",
 }
@@ -78,10 +99,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard03-fg",
+    device_common_srcs: [":art-run-test-host-data-shard03-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard03",
-    src: ":art-run-test-host-data-shard03-tmp",
+    src: ":art-run-test-host-data-shard03-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard03.zip",
 }
@@ -97,10 +125,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard04-fg",
+    device_common_srcs: [":art-run-test-host-data-shard04-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard04",
-    src: ":art-run-test-host-data-shard04-tmp",
+    src: ":art-run-test-host-data-shard04-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard04.zip",
 }
@@ -116,10 +151,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard05-fg",
+    device_common_srcs: [":art-run-test-host-data-shard05-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard05",
-    src: ":art-run-test-host-data-shard05-tmp",
+    src: ":art-run-test-host-data-shard05-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard05.zip",
 }
@@ -135,10 +177,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard06-fg",
+    device_common_srcs: [":art-run-test-host-data-shard06-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard06",
-    src: ":art-run-test-host-data-shard06-tmp",
+    src: ":art-run-test-host-data-shard06-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard06.zip",
 }
@@ -154,10 +203,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard07-fg",
+    device_common_srcs: [":art-run-test-host-data-shard07-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard07",
-    src: ":art-run-test-host-data-shard07-tmp",
+    src: ":art-run-test-host-data-shard07-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard07.zip",
 }
@@ -173,10 +229,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard08-fg",
+    device_common_srcs: [":art-run-test-host-data-shard08-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard08",
-    src: ":art-run-test-host-data-shard08-tmp",
+    src: ":art-run-test-host-data-shard08-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard08.zip",
 }
@@ -192,10 +255,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard09-fg",
+    device_common_srcs: [":art-run-test-host-data-shard09-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard09",
-    src: ":art-run-test-host-data-shard09-tmp",
+    src: ":art-run-test-host-data-shard09-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard09.zip",
 }
@@ -211,10 +281,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard10-fg",
+    device_common_srcs: [":art-run-test-host-data-shard10-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard10",
-    src: ":art-run-test-host-data-shard10-tmp",
+    src: ":art-run-test-host-data-shard10-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard10.zip",
 }
@@ -230,10 +307,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard11-fg",
+    device_common_srcs: [":art-run-test-host-data-shard11-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard11",
-    src: ":art-run-test-host-data-shard11-tmp",
+    src: ":art-run-test-host-data-shard11-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard11.zip",
 }
@@ -249,10 +333,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard12-fg",
+    device_common_srcs: [":art-run-test-host-data-shard12-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard12",
-    src: ":art-run-test-host-data-shard12-tmp",
+    src: ":art-run-test-host-data-shard12-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard12.zip",
 }
@@ -268,10 +359,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard13-fg",
+    device_common_srcs: [":art-run-test-host-data-shard13-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard13",
-    src: ":art-run-test-host-data-shard13-tmp",
+    src: ":art-run-test-host-data-shard13-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard13.zip",
 }
@@ -287,10 +385,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard14-fg",
+    device_common_srcs: [":art-run-test-host-data-shard14-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard14",
-    src: ":art-run-test-host-data-shard14-tmp",
+    src: ":art-run-test-host-data-shard14-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard14.zip",
 }
@@ -306,10 +411,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard15-fg",
+    device_common_srcs: [":art-run-test-host-data-shard15-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard15",
-    src: ":art-run-test-host-data-shard15-tmp",
+    src: ":art-run-test-host-data-shard15-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard15.zip",
 }
@@ -325,10 +437,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard16-fg",
+    device_common_srcs: [":art-run-test-host-data-shard16-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard16",
-    src: ":art-run-test-host-data-shard16-tmp",
+    src: ":art-run-test-host-data-shard16-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard16.zip",
 }
@@ -344,10 +463,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard17-fg",
+    device_common_srcs: [":art-run-test-host-data-shard17-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard17",
-    src: ":art-run-test-host-data-shard17-tmp",
+    src: ":art-run-test-host-data-shard17-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard17.zip",
 }
@@ -363,10 +489,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard18-fg",
+    device_common_srcs: [":art-run-test-host-data-shard18-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard18",
-    src: ":art-run-test-host-data-shard18-tmp",
+    src: ":art-run-test-host-data-shard18-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard18.zip",
 }
@@ -382,10 +515,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard19-fg",
+    device_common_srcs: [":art-run-test-host-data-shard19-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard19",
-    src: ":art-run-test-host-data-shard19-tmp",
+    src: ":art-run-test-host-data-shard19-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard19.zip",
 }
@@ -401,10 +541,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard20-fg",
+    device_common_srcs: [":art-run-test-host-data-shard20-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard20",
-    src: ":art-run-test-host-data-shard20-tmp",
+    src: ":art-run-test-host-data-shard20-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard20.zip",
 }
@@ -420,10 +567,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard21-fg",
+    device_common_srcs: [":art-run-test-host-data-shard21-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard21",
-    src: ":art-run-test-host-data-shard21-tmp",
+    src: ":art-run-test-host-data-shard21-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard21.zip",
 }
@@ -439,10 +593,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard22-fg",
+    device_common_srcs: [":art-run-test-host-data-shard22-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard22",
-    src: ":art-run-test-host-data-shard22-tmp",
+    src: ":art-run-test-host-data-shard22-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard22.zip",
 }
@@ -458,10 +619,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard23-fg",
+    device_common_srcs: [":art-run-test-host-data-shard23-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard23",
-    src: ":art-run-test-host-data-shard23-tmp",
+    src: ":art-run-test-host-data-shard23-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard23.zip",
 }
@@ -477,10 +645,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard24-fg",
+    device_common_srcs: [":art-run-test-host-data-shard24-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard24",
-    src: ":art-run-test-host-data-shard24-tmp",
+    src: ":art-run-test-host-data-shard24-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard24.zip",
 }
@@ -496,10 +671,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard25-fg",
+    device_common_srcs: [":art-run-test-host-data-shard25-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard25",
-    src: ":art-run-test-host-data-shard25-tmp",
+    src: ":art-run-test-host-data-shard25-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard25.zip",
 }
@@ -515,10 +697,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard26-fg",
+    device_common_srcs: [":art-run-test-host-data-shard26-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard26",
-    src: ":art-run-test-host-data-shard26-tmp",
+    src: ":art-run-test-host-data-shard26-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard26.zip",
 }
@@ -534,10 +723,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard27-fg",
+    device_common_srcs: [":art-run-test-host-data-shard27-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard27",
-    src: ":art-run-test-host-data-shard27-tmp",
+    src: ":art-run-test-host-data-shard27-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard27.zip",
 }
@@ -553,10 +749,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard28-fg",
+    device_common_srcs: [":art-run-test-host-data-shard28-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard28",
-    src: ":art-run-test-host-data-shard28-tmp",
+    src: ":art-run-test-host-data-shard28-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard28.zip",
 }
@@ -572,10 +775,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard29-fg",
+    device_common_srcs: [":art-run-test-host-data-shard29-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard29",
-    src: ":art-run-test-host-data-shard29-tmp",
+    src: ":art-run-test-host-data-shard29-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard29.zip",
 }
@@ -591,10 +801,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard30-fg",
+    device_common_srcs: [":art-run-test-host-data-shard30-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard30",
-    src: ":art-run-test-host-data-shard30-tmp",
+    src: ":art-run-test-host-data-shard30-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard30.zip",
 }
@@ -610,10 +827,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard31-fg",
+    device_common_srcs: [":art-run-test-host-data-shard31-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard31",
-    src: ":art-run-test-host-data-shard31-tmp",
+    src: ":art-run-test-host-data-shard31-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard31.zip",
 }
@@ -629,10 +853,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard32-fg",
+    device_common_srcs: [":art-run-test-host-data-shard32-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard32",
-    src: ":art-run-test-host-data-shard32-tmp",
+    src: ":art-run-test-host-data-shard32-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard32.zip",
 }
@@ -648,10 +879,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard33-fg",
+    device_common_srcs: [":art-run-test-host-data-shard33-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard33",
-    src: ":art-run-test-host-data-shard33-tmp",
+    src: ":art-run-test-host-data-shard33-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard33.zip",
 }
@@ -667,10 +905,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard34-fg",
+    device_common_srcs: [":art-run-test-host-data-shard34-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard34",
-    src: ":art-run-test-host-data-shard34-tmp",
+    src: ":art-run-test-host-data-shard34-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard34.zip",
 }
@@ -686,10 +931,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard35-fg",
+    device_common_srcs: [":art-run-test-host-data-shard35-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard35",
-    src: ":art-run-test-host-data-shard35-tmp",
+    src: ":art-run-test-host-data-shard35-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard35.zip",
 }
@@ -705,10 +957,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard36-fg",
+    device_common_srcs: [":art-run-test-host-data-shard36-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard36",
-    src: ":art-run-test-host-data-shard36-tmp",
+    src: ":art-run-test-host-data-shard36-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard36.zip",
 }
@@ -724,10 +983,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard37-fg",
+    device_common_srcs: [":art-run-test-host-data-shard37-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard37",
-    src: ":art-run-test-host-data-shard37-tmp",
+    src: ":art-run-test-host-data-shard37-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard37.zip",
 }
@@ -743,10 +1009,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard38-fg",
+    device_common_srcs: [":art-run-test-host-data-shard38-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard38",
-    src: ":art-run-test-host-data-shard38-tmp",
+    src: ":art-run-test-host-data-shard38-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard38.zip",
 }
@@ -762,10 +1035,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard39-fg",
+    device_common_srcs: [":art-run-test-host-data-shard39-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard39",
-    src: ":art-run-test-host-data-shard39-tmp",
+    src: ":art-run-test-host-data-shard39-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard39.zip",
 }
@@ -781,10 +1061,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard40-fg",
+    device_common_srcs: [":art-run-test-host-data-shard40-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard40",
-    src: ":art-run-test-host-data-shard40-tmp",
+    src: ":art-run-test-host-data-shard40-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard40.zip",
 }
@@ -800,10 +1087,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard41-fg",
+    device_common_srcs: [":art-run-test-host-data-shard41-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard41",
-    src: ":art-run-test-host-data-shard41-tmp",
+    src: ":art-run-test-host-data-shard41-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard41.zip",
 }
@@ -819,10 +1113,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard42-fg",
+    device_common_srcs: [":art-run-test-host-data-shard42-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard42",
-    src: ":art-run-test-host-data-shard42-tmp",
+    src: ":art-run-test-host-data-shard42-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard42.zip",
 }
@@ -838,10 +1139,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard43-fg",
+    device_common_srcs: [":art-run-test-host-data-shard43-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard43",
-    src: ":art-run-test-host-data-shard43-tmp",
+    src: ":art-run-test-host-data-shard43-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard43.zip",
 }
@@ -857,10 +1165,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard44-fg",
+    device_common_srcs: [":art-run-test-host-data-shard44-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard44",
-    src: ":art-run-test-host-data-shard44-tmp",
+    src: ":art-run-test-host-data-shard44-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard44.zip",
 }
@@ -876,10 +1191,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard45-fg",
+    device_common_srcs: [":art-run-test-host-data-shard45-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard45",
-    src: ":art-run-test-host-data-shard45-tmp",
+    src: ":art-run-test-host-data-shard45-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard45.zip",
 }
@@ -895,10 +1217,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard46-fg",
+    device_common_srcs: [":art-run-test-host-data-shard46-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard46",
-    src: ":art-run-test-host-data-shard46-tmp",
+    src: ":art-run-test-host-data-shard46-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard46.zip",
 }
@@ -914,10 +1243,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard47-fg",
+    device_common_srcs: [":art-run-test-host-data-shard47-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard47",
-    src: ":art-run-test-host-data-shard47-tmp",
+    src: ":art-run-test-host-data-shard47-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard47.zip",
 }
@@ -933,10 +1269,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard48-fg",
+    device_common_srcs: [":art-run-test-host-data-shard48-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard48",
-    src: ":art-run-test-host-data-shard48-tmp",
+    src: ":art-run-test-host-data-shard48-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard48.zip",
 }
@@ -952,10 +1295,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard49-fg",
+    device_common_srcs: [":art-run-test-host-data-shard49-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard49",
-    src: ":art-run-test-host-data-shard49-tmp",
+    src: ":art-run-test-host-data-shard49-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard49.zip",
 }
@@ -971,10 +1321,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard50-fg",
+    device_common_srcs: [":art-run-test-host-data-shard50-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard50",
-    src: ":art-run-test-host-data-shard50-tmp",
+    src: ":art-run-test-host-data-shard50-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard50.zip",
 }
@@ -990,10 +1347,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard51-fg",
+    device_common_srcs: [":art-run-test-host-data-shard51-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard51",
-    src: ":art-run-test-host-data-shard51-tmp",
+    src: ":art-run-test-host-data-shard51-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard51.zip",
 }
@@ -1009,10 +1373,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard52-fg",
+    device_common_srcs: [":art-run-test-host-data-shard52-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard52",
-    src: ":art-run-test-host-data-shard52-tmp",
+    src: ":art-run-test-host-data-shard52-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard52.zip",
 }
@@ -1028,10 +1399,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard53-fg",
+    device_common_srcs: [":art-run-test-host-data-shard53-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard53",
-    src: ":art-run-test-host-data-shard53-tmp",
+    src: ":art-run-test-host-data-shard53-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard53.zip",
 }
@@ -1047,10 +1425,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard54-fg",
+    device_common_srcs: [":art-run-test-host-data-shard54-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard54",
-    src: ":art-run-test-host-data-shard54-tmp",
+    src: ":art-run-test-host-data-shard54-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard54.zip",
 }
@@ -1066,10 +1451,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard55-fg",
+    device_common_srcs: [":art-run-test-host-data-shard55-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard55",
-    src: ":art-run-test-host-data-shard55-tmp",
+    src: ":art-run-test-host-data-shard55-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard55.zip",
 }
@@ -1085,10 +1477,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard56-fg",
+    device_common_srcs: [":art-run-test-host-data-shard56-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard56",
-    src: ":art-run-test-host-data-shard56-tmp",
+    src: ":art-run-test-host-data-shard56-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard56.zip",
 }
@@ -1104,10 +1503,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard57-fg",
+    device_common_srcs: [":art-run-test-host-data-shard57-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard57",
-    src: ":art-run-test-host-data-shard57-tmp",
+    src: ":art-run-test-host-data-shard57-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard57.zip",
 }
@@ -1123,10 +1529,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard58-fg",
+    device_common_srcs: [":art-run-test-host-data-shard58-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard58",
-    src: ":art-run-test-host-data-shard58-tmp",
+    src: ":art-run-test-host-data-shard58-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard58.zip",
 }
@@ -1142,10 +1555,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard59-fg",
+    device_common_srcs: [":art-run-test-host-data-shard59-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard59",
-    src: ":art-run-test-host-data-shard59-tmp",
+    src: ":art-run-test-host-data-shard59-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard59.zip",
 }
@@ -1161,10 +1581,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard60-fg",
+    device_common_srcs: [":art-run-test-host-data-shard60-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard60",
-    src: ":art-run-test-host-data-shard60-tmp",
+    src: ":art-run-test-host-data-shard60-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard60.zip",
 }
@@ -1180,10 +1607,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard61-fg",
+    device_common_srcs: [":art-run-test-host-data-shard61-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard61",
-    src: ":art-run-test-host-data-shard61-tmp",
+    src: ":art-run-test-host-data-shard61-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard61.zip",
 }
@@ -1199,10 +1633,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard62-fg",
+    device_common_srcs: [":art-run-test-host-data-shard62-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard62",
-    src: ":art-run-test-host-data-shard62-tmp",
+    src: ":art-run-test-host-data-shard62-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard62.zip",
 }
@@ -1218,10 +1659,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard63-fg",
+    device_common_srcs: [":art-run-test-host-data-shard63-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard63",
-    src: ":art-run-test-host-data-shard63-tmp",
+    src: ":art-run-test-host-data-shard63-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard63.zip",
 }
@@ -1237,10 +1685,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard64-fg",
+    device_common_srcs: [":art-run-test-host-data-shard64-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard64",
-    src: ":art-run-test-host-data-shard64-tmp",
+    src: ":art-run-test-host-data-shard64-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard64.zip",
 }
@@ -1256,10 +1711,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard65-fg",
+    device_common_srcs: [":art-run-test-host-data-shard65-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard65",
-    src: ":art-run-test-host-data-shard65-tmp",
+    src: ":art-run-test-host-data-shard65-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard65.zip",
 }
@@ -1275,10 +1737,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard66-fg",
+    device_common_srcs: [":art-run-test-host-data-shard66-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard66",
-    src: ":art-run-test-host-data-shard66-tmp",
+    src: ":art-run-test-host-data-shard66-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard66.zip",
 }
@@ -1294,10 +1763,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard67-fg",
+    device_common_srcs: [":art-run-test-host-data-shard67-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard67",
-    src: ":art-run-test-host-data-shard67-tmp",
+    src: ":art-run-test-host-data-shard67-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard67.zip",
 }
@@ -1313,10 +1789,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard68-fg",
+    device_common_srcs: [":art-run-test-host-data-shard68-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard68",
-    src: ":art-run-test-host-data-shard68-tmp",
+    src: ":art-run-test-host-data-shard68-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard68.zip",
 }
@@ -1332,10 +1815,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard69-fg",
+    device_common_srcs: [":art-run-test-host-data-shard69-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard69",
-    src: ":art-run-test-host-data-shard69-tmp",
+    src: ":art-run-test-host-data-shard69-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard69.zip",
 }
@@ -1351,10 +1841,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard70-fg",
+    device_common_srcs: [":art-run-test-host-data-shard70-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard70",
-    src: ":art-run-test-host-data-shard70-tmp",
+    src: ":art-run-test-host-data-shard70-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard70.zip",
 }
@@ -1370,10 +1867,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard71-fg",
+    device_common_srcs: [":art-run-test-host-data-shard71-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard71",
-    src: ":art-run-test-host-data-shard71-tmp",
+    src: ":art-run-test-host-data-shard71-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard71.zip",
 }
@@ -1389,10 +1893,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard72-fg",
+    device_common_srcs: [":art-run-test-host-data-shard72-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard72",
-    src: ":art-run-test-host-data-shard72-tmp",
+    src: ":art-run-test-host-data-shard72-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard72.zip",
 }
@@ -1408,10 +1919,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard73-fg",
+    device_common_srcs: [":art-run-test-host-data-shard73-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard73",
-    src: ":art-run-test-host-data-shard73-tmp",
+    src: ":art-run-test-host-data-shard73-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard73.zip",
 }
@@ -1427,10 +1945,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard74-fg",
+    device_common_srcs: [":art-run-test-host-data-shard74-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard74",
-    src: ":art-run-test-host-data-shard74-tmp",
+    src: ":art-run-test-host-data-shard74-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard74.zip",
 }
@@ -1446,10 +1971,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard75-fg",
+    device_common_srcs: [":art-run-test-host-data-shard75-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard75",
-    src: ":art-run-test-host-data-shard75-tmp",
+    src: ":art-run-test-host-data-shard75-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard75.zip",
 }
@@ -1465,10 +1997,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard76-fg",
+    device_common_srcs: [":art-run-test-host-data-shard76-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard76",
-    src: ":art-run-test-host-data-shard76-tmp",
+    src: ":art-run-test-host-data-shard76-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard76.zip",
 }
@@ -1484,10 +2023,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard77-fg",
+    device_common_srcs: [":art-run-test-host-data-shard77-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard77",
-    src: ":art-run-test-host-data-shard77-tmp",
+    src: ":art-run-test-host-data-shard77-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard77.zip",
 }
@@ -1503,10 +2049,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard78-fg",
+    device_common_srcs: [":art-run-test-host-data-shard78-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard78",
-    src: ":art-run-test-host-data-shard78-tmp",
+    src: ":art-run-test-host-data-shard78-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard78.zip",
 }
@@ -1522,10 +2075,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard79-fg",
+    device_common_srcs: [":art-run-test-host-data-shard79-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard79",
-    src: ":art-run-test-host-data-shard79-tmp",
+    src: ":art-run-test-host-data-shard79-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard79.zip",
 }
@@ -1541,10 +2101,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard80-fg",
+    device_common_srcs: [":art-run-test-host-data-shard80-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard80",
-    src: ":art-run-test-host-data-shard80-tmp",
+    src: ":art-run-test-host-data-shard80-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard80.zip",
 }
@@ -1560,10 +2127,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard81-fg",
+    device_common_srcs: [":art-run-test-host-data-shard81-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard81",
-    src: ":art-run-test-host-data-shard81-tmp",
+    src: ":art-run-test-host-data-shard81-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard81.zip",
 }
@@ -1579,10 +2153,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard82-fg",
+    device_common_srcs: [":art-run-test-host-data-shard82-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard82",
-    src: ":art-run-test-host-data-shard82-tmp",
+    src: ":art-run-test-host-data-shard82-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard82.zip",
 }
@@ -1598,10 +2179,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard83-fg",
+    device_common_srcs: [":art-run-test-host-data-shard83-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard83",
-    src: ":art-run-test-host-data-shard83-tmp",
+    src: ":art-run-test-host-data-shard83-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard83.zip",
 }
@@ -1617,10 +2205,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard84-fg",
+    device_common_srcs: [":art-run-test-host-data-shard84-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard84",
-    src: ":art-run-test-host-data-shard84-tmp",
+    src: ":art-run-test-host-data-shard84-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard84.zip",
 }
@@ -1636,10 +2231,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard85-fg",
+    device_common_srcs: [":art-run-test-host-data-shard85-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard85",
-    src: ":art-run-test-host-data-shard85-tmp",
+    src: ":art-run-test-host-data-shard85-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard85.zip",
 }
@@ -1655,10 +2257,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard86-fg",
+    device_common_srcs: [":art-run-test-host-data-shard86-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard86",
-    src: ":art-run-test-host-data-shard86-tmp",
+    src: ":art-run-test-host-data-shard86-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard86.zip",
 }
@@ -1674,10 +2283,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard87-fg",
+    device_common_srcs: [":art-run-test-host-data-shard87-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard87",
-    src: ":art-run-test-host-data-shard87-tmp",
+    src: ":art-run-test-host-data-shard87-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard87.zip",
 }
@@ -1693,10 +2309,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard88-fg",
+    device_common_srcs: [":art-run-test-host-data-shard88-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard88",
-    src: ":art-run-test-host-data-shard88-tmp",
+    src: ":art-run-test-host-data-shard88-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard88.zip",
 }
@@ -1712,10 +2335,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard89-fg",
+    device_common_srcs: [":art-run-test-host-data-shard89-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard89",
-    src: ":art-run-test-host-data-shard89-tmp",
+    src: ":art-run-test-host-data-shard89-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard89.zip",
 }
@@ -1731,10 +2361,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard90-fg",
+    device_common_srcs: [":art-run-test-host-data-shard90-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard90",
-    src: ":art-run-test-host-data-shard90-tmp",
+    src: ":art-run-test-host-data-shard90-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard90.zip",
 }
@@ -1750,10 +2387,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard91-fg",
+    device_common_srcs: [":art-run-test-host-data-shard91-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard91",
-    src: ":art-run-test-host-data-shard91-tmp",
+    src: ":art-run-test-host-data-shard91-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard91.zip",
 }
@@ -1769,10 +2413,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard92-fg",
+    device_common_srcs: [":art-run-test-host-data-shard92-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard92",
-    src: ":art-run-test-host-data-shard92-tmp",
+    src: ":art-run-test-host-data-shard92-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard92.zip",
 }
@@ -1788,10 +2439,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard93-fg",
+    device_common_srcs: [":art-run-test-host-data-shard93-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard93",
-    src: ":art-run-test-host-data-shard93-tmp",
+    src: ":art-run-test-host-data-shard93-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard93.zip",
 }
@@ -1807,10 +2465,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard94-fg",
+    device_common_srcs: [":art-run-test-host-data-shard94-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard94",
-    src: ":art-run-test-host-data-shard94-tmp",
+    src: ":art-run-test-host-data-shard94-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard94.zip",
 }
@@ -1826,10 +2491,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard95-fg",
+    device_common_srcs: [":art-run-test-host-data-shard95-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard95",
-    src: ":art-run-test-host-data-shard95-tmp",
+    src: ":art-run-test-host-data-shard95-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard95.zip",
 }
@@ -1845,10 +2517,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard96-fg",
+    device_common_srcs: [":art-run-test-host-data-shard96-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard96",
-    src: ":art-run-test-host-data-shard96-tmp",
+    src: ":art-run-test-host-data-shard96-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard96.zip",
 }
@@ -1864,10 +2543,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard97-fg",
+    device_common_srcs: [":art-run-test-host-data-shard97-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard97",
-    src: ":art-run-test-host-data-shard97-tmp",
+    src: ":art-run-test-host-data-shard97-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard97.zip",
 }
@@ -1883,10 +2569,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard98-fg",
+    device_common_srcs: [":art-run-test-host-data-shard98-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard98",
-    src: ":art-run-test-host-data-shard98-tmp",
+    src: ":art-run-test-host-data-shard98-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard98.zip",
 }
@@ -1902,10 +2595,17 @@ java_genrule {
     defaults: ["art-run-test-host-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shard99-fg",
+    device_common_srcs: [":art-run-test-host-data-shard99-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shard99",
-    src: ":art-run-test-host-data-shard99-tmp",
+    src: ":art-run-test-host-data-shard99-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shard99.zip",
 }
@@ -1922,10 +2622,17 @@ java_genrule {
     cmd: TEST_BUILD_COMMON_ARGS + "--hiddenapi $(location hiddenapi) --mode host --test-dir-regex 'art/test/....?-[^/]*hiddenapi' $(in)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-shardHiddenApi-fg",
+    device_common_srcs: [":art-run-test-host-data-shardHiddenApi-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-shardHiddenApi",
-    src: ":art-run-test-host-data-shardHiddenApi-tmp",
+    src: ":art-run-test-host-data-shardHiddenApi-fg",
     sub_dir: "art",
     filename: "art-run-test-host-data-shardHiddenApi.zip",
 }
@@ -2073,10 +2780,17 @@ java_genrule {
     cmd: "$(location merge_zips) $(out) $(in)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-merged-fg",
+    device_common_srcs: [":art-run-test-host-data-merged-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-host-data-merged",
-    src: ":art-run-test-host-data-merged-tmp",
+    src: ":art-run-test-host-data-merged-fg",
     required: [
         "art-run-test-host-data-shard00",
         "art-run-test-host-data-shard01",
@@ -2294,10 +3008,17 @@ java_genrule {
     cmd: "echo $(in) > $(out)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-host-data-fg",
+    device_common_srcs: [":art-run-test-host-data-tmp"],
+}
+
 // Phony target used to install all shards
 prebuilt_etc_host {
     name: "art-run-test-host-data",
-    src: ":art-run-test-host-data-tmp",
+    src: ":art-run-test-host-data-fg",
     required: [
         "art-run-test-host-data-shard00",
         "art-run-test-host-data-shard01",
@@ -2416,10 +3137,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard00-fg",
+    device_common_srcs: [":art-run-test-target-data-shard00-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard00",
-    src: ":art-run-test-target-data-shard00-tmp",
+    src: ":art-run-test-target-data-shard00-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard00.zip",
 }
@@ -2435,10 +3163,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard01-fg",
+    device_common_srcs: [":art-run-test-target-data-shard01-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard01",
-    src: ":art-run-test-target-data-shard01-tmp",
+    src: ":art-run-test-target-data-shard01-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard01.zip",
 }
@@ -2454,10 +3189,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard02-fg",
+    device_common_srcs: [":art-run-test-target-data-shard02-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard02",
-    src: ":art-run-test-target-data-shard02-tmp",
+    src: ":art-run-test-target-data-shard02-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard02.zip",
 }
@@ -2473,10 +3215,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard03-fg",
+    device_common_srcs: [":art-run-test-target-data-shard03-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard03",
-    src: ":art-run-test-target-data-shard03-tmp",
+    src: ":art-run-test-target-data-shard03-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard03.zip",
 }
@@ -2492,10 +3241,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard04-fg",
+    device_common_srcs: [":art-run-test-target-data-shard04-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard04",
-    src: ":art-run-test-target-data-shard04-tmp",
+    src: ":art-run-test-target-data-shard04-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard04.zip",
 }
@@ -2511,10 +3267,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard05-fg",
+    device_common_srcs: [":art-run-test-target-data-shard05-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard05",
-    src: ":art-run-test-target-data-shard05-tmp",
+    src: ":art-run-test-target-data-shard05-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard05.zip",
 }
@@ -2530,10 +3293,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard06-fg",
+    device_common_srcs: [":art-run-test-target-data-shard06-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard06",
-    src: ":art-run-test-target-data-shard06-tmp",
+    src: ":art-run-test-target-data-shard06-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard06.zip",
 }
@@ -2549,10 +3319,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard07-fg",
+    device_common_srcs: [":art-run-test-target-data-shard07-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard07",
-    src: ":art-run-test-target-data-shard07-tmp",
+    src: ":art-run-test-target-data-shard07-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard07.zip",
 }
@@ -2568,10 +3345,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard08-fg",
+    device_common_srcs: [":art-run-test-target-data-shard08-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard08",
-    src: ":art-run-test-target-data-shard08-tmp",
+    src: ":art-run-test-target-data-shard08-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard08.zip",
 }
@@ -2587,10 +3371,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard09-fg",
+    device_common_srcs: [":art-run-test-target-data-shard09-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard09",
-    src: ":art-run-test-target-data-shard09-tmp",
+    src: ":art-run-test-target-data-shard09-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard09.zip",
 }
@@ -2606,10 +3397,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard10-fg",
+    device_common_srcs: [":art-run-test-target-data-shard10-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard10",
-    src: ":art-run-test-target-data-shard10-tmp",
+    src: ":art-run-test-target-data-shard10-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard10.zip",
 }
@@ -2625,10 +3423,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard11-fg",
+    device_common_srcs: [":art-run-test-target-data-shard11-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard11",
-    src: ":art-run-test-target-data-shard11-tmp",
+    src: ":art-run-test-target-data-shard11-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard11.zip",
 }
@@ -2644,10 +3449,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard12-fg",
+    device_common_srcs: [":art-run-test-target-data-shard12-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard12",
-    src: ":art-run-test-target-data-shard12-tmp",
+    src: ":art-run-test-target-data-shard12-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard12.zip",
 }
@@ -2663,10 +3475,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard13-fg",
+    device_common_srcs: [":art-run-test-target-data-shard13-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard13",
-    src: ":art-run-test-target-data-shard13-tmp",
+    src: ":art-run-test-target-data-shard13-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard13.zip",
 }
@@ -2682,10 +3501,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard14-fg",
+    device_common_srcs: [":art-run-test-target-data-shard14-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard14",
-    src: ":art-run-test-target-data-shard14-tmp",
+    src: ":art-run-test-target-data-shard14-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard14.zip",
 }
@@ -2701,10 +3527,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard15-fg",
+    device_common_srcs: [":art-run-test-target-data-shard15-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard15",
-    src: ":art-run-test-target-data-shard15-tmp",
+    src: ":art-run-test-target-data-shard15-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard15.zip",
 }
@@ -2720,10 +3553,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard16-fg",
+    device_common_srcs: [":art-run-test-target-data-shard16-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard16",
-    src: ":art-run-test-target-data-shard16-tmp",
+    src: ":art-run-test-target-data-shard16-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard16.zip",
 }
@@ -2739,10 +3579,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard17-fg",
+    device_common_srcs: [":art-run-test-target-data-shard17-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard17",
-    src: ":art-run-test-target-data-shard17-tmp",
+    src: ":art-run-test-target-data-shard17-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard17.zip",
 }
@@ -2758,10 +3605,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard18-fg",
+    device_common_srcs: [":art-run-test-target-data-shard18-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard18",
-    src: ":art-run-test-target-data-shard18-tmp",
+    src: ":art-run-test-target-data-shard18-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard18.zip",
 }
@@ -2777,10 +3631,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard19-fg",
+    device_common_srcs: [":art-run-test-target-data-shard19-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard19",
-    src: ":art-run-test-target-data-shard19-tmp",
+    src: ":art-run-test-target-data-shard19-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard19.zip",
 }
@@ -2796,10 +3657,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard20-fg",
+    device_common_srcs: [":art-run-test-target-data-shard20-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard20",
-    src: ":art-run-test-target-data-shard20-tmp",
+    src: ":art-run-test-target-data-shard20-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard20.zip",
 }
@@ -2815,10 +3683,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard21-fg",
+    device_common_srcs: [":art-run-test-target-data-shard21-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard21",
-    src: ":art-run-test-target-data-shard21-tmp",
+    src: ":art-run-test-target-data-shard21-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard21.zip",
 }
@@ -2834,10 +3709,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard22-fg",
+    device_common_srcs: [":art-run-test-target-data-shard22-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard22",
-    src: ":art-run-test-target-data-shard22-tmp",
+    src: ":art-run-test-target-data-shard22-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard22.zip",
 }
@@ -2853,10 +3735,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard23-fg",
+    device_common_srcs: [":art-run-test-target-data-shard23-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard23",
-    src: ":art-run-test-target-data-shard23-tmp",
+    src: ":art-run-test-target-data-shard23-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard23.zip",
 }
@@ -2872,10 +3761,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard24-fg",
+    device_common_srcs: [":art-run-test-target-data-shard24-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard24",
-    src: ":art-run-test-target-data-shard24-tmp",
+    src: ":art-run-test-target-data-shard24-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard24.zip",
 }
@@ -2891,10 +3787,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard25-fg",
+    device_common_srcs: [":art-run-test-target-data-shard25-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard25",
-    src: ":art-run-test-target-data-shard25-tmp",
+    src: ":art-run-test-target-data-shard25-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard25.zip",
 }
@@ -2910,10 +3813,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard26-fg",
+    device_common_srcs: [":art-run-test-target-data-shard26-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard26",
-    src: ":art-run-test-target-data-shard26-tmp",
+    src: ":art-run-test-target-data-shard26-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard26.zip",
 }
@@ -2929,10 +3839,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard27-fg",
+    device_common_srcs: [":art-run-test-target-data-shard27-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard27",
-    src: ":art-run-test-target-data-shard27-tmp",
+    src: ":art-run-test-target-data-shard27-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard27.zip",
 }
@@ -2948,10 +3865,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard28-fg",
+    device_common_srcs: [":art-run-test-target-data-shard28-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard28",
-    src: ":art-run-test-target-data-shard28-tmp",
+    src: ":art-run-test-target-data-shard28-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard28.zip",
 }
@@ -2967,10 +3891,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard29-fg",
+    device_common_srcs: [":art-run-test-target-data-shard29-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard29",
-    src: ":art-run-test-target-data-shard29-tmp",
+    src: ":art-run-test-target-data-shard29-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard29.zip",
 }
@@ -2986,10 +3917,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard30-fg",
+    device_common_srcs: [":art-run-test-target-data-shard30-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard30",
-    src: ":art-run-test-target-data-shard30-tmp",
+    src: ":art-run-test-target-data-shard30-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard30.zip",
 }
@@ -3005,10 +3943,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard31-fg",
+    device_common_srcs: [":art-run-test-target-data-shard31-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard31",
-    src: ":art-run-test-target-data-shard31-tmp",
+    src: ":art-run-test-target-data-shard31-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard31.zip",
 }
@@ -3024,10 +3969,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard32-fg",
+    device_common_srcs: [":art-run-test-target-data-shard32-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard32",
-    src: ":art-run-test-target-data-shard32-tmp",
+    src: ":art-run-test-target-data-shard32-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard32.zip",
 }
@@ -3043,10 +3995,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard33-fg",
+    device_common_srcs: [":art-run-test-target-data-shard33-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard33",
-    src: ":art-run-test-target-data-shard33-tmp",
+    src: ":art-run-test-target-data-shard33-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard33.zip",
 }
@@ -3062,10 +4021,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard34-fg",
+    device_common_srcs: [":art-run-test-target-data-shard34-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard34",
-    src: ":art-run-test-target-data-shard34-tmp",
+    src: ":art-run-test-target-data-shard34-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard34.zip",
 }
@@ -3081,10 +4047,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard35-fg",
+    device_common_srcs: [":art-run-test-target-data-shard35-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard35",
-    src: ":art-run-test-target-data-shard35-tmp",
+    src: ":art-run-test-target-data-shard35-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard35.zip",
 }
@@ -3100,10 +4073,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard36-fg",
+    device_common_srcs: [":art-run-test-target-data-shard36-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard36",
-    src: ":art-run-test-target-data-shard36-tmp",
+    src: ":art-run-test-target-data-shard36-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard36.zip",
 }
@@ -3119,10 +4099,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard37-fg",
+    device_common_srcs: [":art-run-test-target-data-shard37-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard37",
-    src: ":art-run-test-target-data-shard37-tmp",
+    src: ":art-run-test-target-data-shard37-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard37.zip",
 }
@@ -3138,10 +4125,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard38-fg",
+    device_common_srcs: [":art-run-test-target-data-shard38-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard38",
-    src: ":art-run-test-target-data-shard38-tmp",
+    src: ":art-run-test-target-data-shard38-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard38.zip",
 }
@@ -3157,10 +4151,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard39-fg",
+    device_common_srcs: [":art-run-test-target-data-shard39-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard39",
-    src: ":art-run-test-target-data-shard39-tmp",
+    src: ":art-run-test-target-data-shard39-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard39.zip",
 }
@@ -3176,10 +4177,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard40-fg",
+    device_common_srcs: [":art-run-test-target-data-shard40-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard40",
-    src: ":art-run-test-target-data-shard40-tmp",
+    src: ":art-run-test-target-data-shard40-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard40.zip",
 }
@@ -3195,10 +4203,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard41-fg",
+    device_common_srcs: [":art-run-test-target-data-shard41-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard41",
-    src: ":art-run-test-target-data-shard41-tmp",
+    src: ":art-run-test-target-data-shard41-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard41.zip",
 }
@@ -3214,10 +4229,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard42-fg",
+    device_common_srcs: [":art-run-test-target-data-shard42-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard42",
-    src: ":art-run-test-target-data-shard42-tmp",
+    src: ":art-run-test-target-data-shard42-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard42.zip",
 }
@@ -3233,10 +4255,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard43-fg",
+    device_common_srcs: [":art-run-test-target-data-shard43-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard43",
-    src: ":art-run-test-target-data-shard43-tmp",
+    src: ":art-run-test-target-data-shard43-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard43.zip",
 }
@@ -3252,10 +4281,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard44-fg",
+    device_common_srcs: [":art-run-test-target-data-shard44-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard44",
-    src: ":art-run-test-target-data-shard44-tmp",
+    src: ":art-run-test-target-data-shard44-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard44.zip",
 }
@@ -3271,10 +4307,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard45-fg",
+    device_common_srcs: [":art-run-test-target-data-shard45-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard45",
-    src: ":art-run-test-target-data-shard45-tmp",
+    src: ":art-run-test-target-data-shard45-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard45.zip",
 }
@@ -3290,10 +4333,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard46-fg",
+    device_common_srcs: [":art-run-test-target-data-shard46-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard46",
-    src: ":art-run-test-target-data-shard46-tmp",
+    src: ":art-run-test-target-data-shard46-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard46.zip",
 }
@@ -3309,10 +4359,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard47-fg",
+    device_common_srcs: [":art-run-test-target-data-shard47-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard47",
-    src: ":art-run-test-target-data-shard47-tmp",
+    src: ":art-run-test-target-data-shard47-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard47.zip",
 }
@@ -3328,10 +4385,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard48-fg",
+    device_common_srcs: [":art-run-test-target-data-shard48-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard48",
-    src: ":art-run-test-target-data-shard48-tmp",
+    src: ":art-run-test-target-data-shard48-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard48.zip",
 }
@@ -3347,10 +4411,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard49-fg",
+    device_common_srcs: [":art-run-test-target-data-shard49-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard49",
-    src: ":art-run-test-target-data-shard49-tmp",
+    src: ":art-run-test-target-data-shard49-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard49.zip",
 }
@@ -3366,10 +4437,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard50-fg",
+    device_common_srcs: [":art-run-test-target-data-shard50-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard50",
-    src: ":art-run-test-target-data-shard50-tmp",
+    src: ":art-run-test-target-data-shard50-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard50.zip",
 }
@@ -3385,10 +4463,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard51-fg",
+    device_common_srcs: [":art-run-test-target-data-shard51-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard51",
-    src: ":art-run-test-target-data-shard51-tmp",
+    src: ":art-run-test-target-data-shard51-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard51.zip",
 }
@@ -3404,10 +4489,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard52-fg",
+    device_common_srcs: [":art-run-test-target-data-shard52-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard52",
-    src: ":art-run-test-target-data-shard52-tmp",
+    src: ":art-run-test-target-data-shard52-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard52.zip",
 }
@@ -3423,10 +4515,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard53-fg",
+    device_common_srcs: [":art-run-test-target-data-shard53-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard53",
-    src: ":art-run-test-target-data-shard53-tmp",
+    src: ":art-run-test-target-data-shard53-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard53.zip",
 }
@@ -3442,10 +4541,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard54-fg",
+    device_common_srcs: [":art-run-test-target-data-shard54-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard54",
-    src: ":art-run-test-target-data-shard54-tmp",
+    src: ":art-run-test-target-data-shard54-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard54.zip",
 }
@@ -3461,10 +4567,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard55-fg",
+    device_common_srcs: [":art-run-test-target-data-shard55-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard55",
-    src: ":art-run-test-target-data-shard55-tmp",
+    src: ":art-run-test-target-data-shard55-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard55.zip",
 }
@@ -3480,10 +4593,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard56-fg",
+    device_common_srcs: [":art-run-test-target-data-shard56-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard56",
-    src: ":art-run-test-target-data-shard56-tmp",
+    src: ":art-run-test-target-data-shard56-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard56.zip",
 }
@@ -3499,10 +4619,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard57-fg",
+    device_common_srcs: [":art-run-test-target-data-shard57-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard57",
-    src: ":art-run-test-target-data-shard57-tmp",
+    src: ":art-run-test-target-data-shard57-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard57.zip",
 }
@@ -3518,10 +4645,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard58-fg",
+    device_common_srcs: [":art-run-test-target-data-shard58-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard58",
-    src: ":art-run-test-target-data-shard58-tmp",
+    src: ":art-run-test-target-data-shard58-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard58.zip",
 }
@@ -3537,10 +4671,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard59-fg",
+    device_common_srcs: [":art-run-test-target-data-shard59-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard59",
-    src: ":art-run-test-target-data-shard59-tmp",
+    src: ":art-run-test-target-data-shard59-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard59.zip",
 }
@@ -3556,10 +4697,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard60-fg",
+    device_common_srcs: [":art-run-test-target-data-shard60-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard60",
-    src: ":art-run-test-target-data-shard60-tmp",
+    src: ":art-run-test-target-data-shard60-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard60.zip",
 }
@@ -3575,10 +4723,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard61-fg",
+    device_common_srcs: [":art-run-test-target-data-shard61-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard61",
-    src: ":art-run-test-target-data-shard61-tmp",
+    src: ":art-run-test-target-data-shard61-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard61.zip",
 }
@@ -3594,10 +4749,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard62-fg",
+    device_common_srcs: [":art-run-test-target-data-shard62-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard62",
-    src: ":art-run-test-target-data-shard62-tmp",
+    src: ":art-run-test-target-data-shard62-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard62.zip",
 }
@@ -3613,10 +4775,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard63-fg",
+    device_common_srcs: [":art-run-test-target-data-shard63-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard63",
-    src: ":art-run-test-target-data-shard63-tmp",
+    src: ":art-run-test-target-data-shard63-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard63.zip",
 }
@@ -3632,10 +4801,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard64-fg",
+    device_common_srcs: [":art-run-test-target-data-shard64-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard64",
-    src: ":art-run-test-target-data-shard64-tmp",
+    src: ":art-run-test-target-data-shard64-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard64.zip",
 }
@@ -3651,10 +4827,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard65-fg",
+    device_common_srcs: [":art-run-test-target-data-shard65-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard65",
-    src: ":art-run-test-target-data-shard65-tmp",
+    src: ":art-run-test-target-data-shard65-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard65.zip",
 }
@@ -3670,10 +4853,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard66-fg",
+    device_common_srcs: [":art-run-test-target-data-shard66-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard66",
-    src: ":art-run-test-target-data-shard66-tmp",
+    src: ":art-run-test-target-data-shard66-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard66.zip",
 }
@@ -3689,10 +4879,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard67-fg",
+    device_common_srcs: [":art-run-test-target-data-shard67-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard67",
-    src: ":art-run-test-target-data-shard67-tmp",
+    src: ":art-run-test-target-data-shard67-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard67.zip",
 }
@@ -3708,10 +4905,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard68-fg",
+    device_common_srcs: [":art-run-test-target-data-shard68-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard68",
-    src: ":art-run-test-target-data-shard68-tmp",
+    src: ":art-run-test-target-data-shard68-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard68.zip",
 }
@@ -3727,10 +4931,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard69-fg",
+    device_common_srcs: [":art-run-test-target-data-shard69-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard69",
-    src: ":art-run-test-target-data-shard69-tmp",
+    src: ":art-run-test-target-data-shard69-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard69.zip",
 }
@@ -3746,10 +4957,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard70-fg",
+    device_common_srcs: [":art-run-test-target-data-shard70-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard70",
-    src: ":art-run-test-target-data-shard70-tmp",
+    src: ":art-run-test-target-data-shard70-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard70.zip",
 }
@@ -3765,10 +4983,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard71-fg",
+    device_common_srcs: [":art-run-test-target-data-shard71-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard71",
-    src: ":art-run-test-target-data-shard71-tmp",
+    src: ":art-run-test-target-data-shard71-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard71.zip",
 }
@@ -3784,10 +5009,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard72-fg",
+    device_common_srcs: [":art-run-test-target-data-shard72-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard72",
-    src: ":art-run-test-target-data-shard72-tmp",
+    src: ":art-run-test-target-data-shard72-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard72.zip",
 }
@@ -3803,10 +5035,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard73-fg",
+    device_common_srcs: [":art-run-test-target-data-shard73-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard73",
-    src: ":art-run-test-target-data-shard73-tmp",
+    src: ":art-run-test-target-data-shard73-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard73.zip",
 }
@@ -3822,10 +5061,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard74-fg",
+    device_common_srcs: [":art-run-test-target-data-shard74-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard74",
-    src: ":art-run-test-target-data-shard74-tmp",
+    src: ":art-run-test-target-data-shard74-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard74.zip",
 }
@@ -3841,10 +5087,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard75-fg",
+    device_common_srcs: [":art-run-test-target-data-shard75-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard75",
-    src: ":art-run-test-target-data-shard75-tmp",
+    src: ":art-run-test-target-data-shard75-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard75.zip",
 }
@@ -3860,10 +5113,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard76-fg",
+    device_common_srcs: [":art-run-test-target-data-shard76-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard76",
-    src: ":art-run-test-target-data-shard76-tmp",
+    src: ":art-run-test-target-data-shard76-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard76.zip",
 }
@@ -3879,10 +5139,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard77-fg",
+    device_common_srcs: [":art-run-test-target-data-shard77-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard77",
-    src: ":art-run-test-target-data-shard77-tmp",
+    src: ":art-run-test-target-data-shard77-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard77.zip",
 }
@@ -3898,10 +5165,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard78-fg",
+    device_common_srcs: [":art-run-test-target-data-shard78-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard78",
-    src: ":art-run-test-target-data-shard78-tmp",
+    src: ":art-run-test-target-data-shard78-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard78.zip",
 }
@@ -3917,10 +5191,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard79-fg",
+    device_common_srcs: [":art-run-test-target-data-shard79-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard79",
-    src: ":art-run-test-target-data-shard79-tmp",
+    src: ":art-run-test-target-data-shard79-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard79.zip",
 }
@@ -3936,10 +5217,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard80-fg",
+    device_common_srcs: [":art-run-test-target-data-shard80-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard80",
-    src: ":art-run-test-target-data-shard80-tmp",
+    src: ":art-run-test-target-data-shard80-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard80.zip",
 }
@@ -3955,10 +5243,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard81-fg",
+    device_common_srcs: [":art-run-test-target-data-shard81-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard81",
-    src: ":art-run-test-target-data-shard81-tmp",
+    src: ":art-run-test-target-data-shard81-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard81.zip",
 }
@@ -3974,10 +5269,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard82-fg",
+    device_common_srcs: [":art-run-test-target-data-shard82-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard82",
-    src: ":art-run-test-target-data-shard82-tmp",
+    src: ":art-run-test-target-data-shard82-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard82.zip",
 }
@@ -3993,10 +5295,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard83-fg",
+    device_common_srcs: [":art-run-test-target-data-shard83-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard83",
-    src: ":art-run-test-target-data-shard83-tmp",
+    src: ":art-run-test-target-data-shard83-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard83.zip",
 }
@@ -4012,10 +5321,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard84-fg",
+    device_common_srcs: [":art-run-test-target-data-shard84-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard84",
-    src: ":art-run-test-target-data-shard84-tmp",
+    src: ":art-run-test-target-data-shard84-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard84.zip",
 }
@@ -4031,10 +5347,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard85-fg",
+    device_common_srcs: [":art-run-test-target-data-shard85-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard85",
-    src: ":art-run-test-target-data-shard85-tmp",
+    src: ":art-run-test-target-data-shard85-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard85.zip",
 }
@@ -4050,10 +5373,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard86-fg",
+    device_common_srcs: [":art-run-test-target-data-shard86-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard86",
-    src: ":art-run-test-target-data-shard86-tmp",
+    src: ":art-run-test-target-data-shard86-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard86.zip",
 }
@@ -4069,10 +5399,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard87-fg",
+    device_common_srcs: [":art-run-test-target-data-shard87-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard87",
-    src: ":art-run-test-target-data-shard87-tmp",
+    src: ":art-run-test-target-data-shard87-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard87.zip",
 }
@@ -4088,10 +5425,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard88-fg",
+    device_common_srcs: [":art-run-test-target-data-shard88-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard88",
-    src: ":art-run-test-target-data-shard88-tmp",
+    src: ":art-run-test-target-data-shard88-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard88.zip",
 }
@@ -4107,10 +5451,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard89-fg",
+    device_common_srcs: [":art-run-test-target-data-shard89-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard89",
-    src: ":art-run-test-target-data-shard89-tmp",
+    src: ":art-run-test-target-data-shard89-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard89.zip",
 }
@@ -4126,10 +5477,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard90-fg",
+    device_common_srcs: [":art-run-test-target-data-shard90-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard90",
-    src: ":art-run-test-target-data-shard90-tmp",
+    src: ":art-run-test-target-data-shard90-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard90.zip",
 }
@@ -4145,10 +5503,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard91-fg",
+    device_common_srcs: [":art-run-test-target-data-shard91-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard91",
-    src: ":art-run-test-target-data-shard91-tmp",
+    src: ":art-run-test-target-data-shard91-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard91.zip",
 }
@@ -4164,10 +5529,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard92-fg",
+    device_common_srcs: [":art-run-test-target-data-shard92-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard92",
-    src: ":art-run-test-target-data-shard92-tmp",
+    src: ":art-run-test-target-data-shard92-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard92.zip",
 }
@@ -4183,10 +5555,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard93-fg",
+    device_common_srcs: [":art-run-test-target-data-shard93-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard93",
-    src: ":art-run-test-target-data-shard93-tmp",
+    src: ":art-run-test-target-data-shard93-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard93.zip",
 }
@@ -4202,10 +5581,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard94-fg",
+    device_common_srcs: [":art-run-test-target-data-shard94-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard94",
-    src: ":art-run-test-target-data-shard94-tmp",
+    src: ":art-run-test-target-data-shard94-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard94.zip",
 }
@@ -4221,10 +5607,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard95-fg",
+    device_common_srcs: [":art-run-test-target-data-shard95-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard95",
-    src: ":art-run-test-target-data-shard95-tmp",
+    src: ":art-run-test-target-data-shard95-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard95.zip",
 }
@@ -4240,10 +5633,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard96-fg",
+    device_common_srcs: [":art-run-test-target-data-shard96-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard96",
-    src: ":art-run-test-target-data-shard96-tmp",
+    src: ":art-run-test-target-data-shard96-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard96.zip",
 }
@@ -4259,10 +5659,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard97-fg",
+    device_common_srcs: [":art-run-test-target-data-shard97-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard97",
-    src: ":art-run-test-target-data-shard97-tmp",
+    src: ":art-run-test-target-data-shard97-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard97.zip",
 }
@@ -4278,10 +5685,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard98-fg",
+    device_common_srcs: [":art-run-test-target-data-shard98-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard98",
-    src: ":art-run-test-target-data-shard98-tmp",
+    src: ":art-run-test-target-data-shard98-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard98.zip",
 }
@@ -4297,10 +5711,17 @@ java_genrule {
     defaults: ["art-run-test-target-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shard99-fg",
+    device_common_srcs: [":art-run-test-target-data-shard99-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shard99",
-    src: ":art-run-test-target-data-shard99-tmp",
+    src: ":art-run-test-target-data-shard99-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shard99.zip",
 }
@@ -4317,10 +5738,17 @@ java_genrule {
     cmd: TEST_BUILD_COMMON_ARGS + "--hiddenapi $(location hiddenapi) --mode target --test-dir-regex 'art/test/....?-[^/]*hiddenapi' $(in)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-shardHiddenApi-fg",
+    device_common_srcs: [":art-run-test-target-data-shardHiddenApi-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-shardHiddenApi",
-    src: ":art-run-test-target-data-shardHiddenApi-tmp",
+    src: ":art-run-test-target-data-shardHiddenApi-fg",
     sub_dir: "art",
     filename: "art-run-test-target-data-shardHiddenApi.zip",
 }
@@ -4468,10 +5896,17 @@ java_genrule {
     cmd: "$(location merge_zips) $(out) $(in)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-merged-fg",
+    device_common_srcs: [":art-run-test-target-data-merged-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-target-data-merged",
-    src: ":art-run-test-target-data-merged-tmp",
+    src: ":art-run-test-target-data-merged-fg",
     required: [
         "art-run-test-target-data-shard00",
         "art-run-test-target-data-shard01",
@@ -4689,10 +6124,17 @@ java_genrule {
     cmd: "echo $(in) > $(out)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-target-data-fg",
+    device_common_srcs: [":art-run-test-target-data-tmp"],
+}
+
 // Phony target used to install all shards
 prebuilt_etc_host {
     name: "art-run-test-target-data",
-    src: ":art-run-test-target-data-tmp",
+    src: ":art-run-test-target-data-fg",
     required: [
         "art-run-test-target-data-shard00",
         "art-run-test-target-data-shard01",
@@ -4811,10 +6253,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard00-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard00-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard00",
-    src: ":art-run-test-jvm-data-shard00-tmp",
+    src: ":art-run-test-jvm-data-shard00-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard00.zip",
 }
@@ -4830,10 +6279,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard01-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard01-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard01",
-    src: ":art-run-test-jvm-data-shard01-tmp",
+    src: ":art-run-test-jvm-data-shard01-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard01.zip",
 }
@@ -4849,10 +6305,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard02-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard02-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard02",
-    src: ":art-run-test-jvm-data-shard02-tmp",
+    src: ":art-run-test-jvm-data-shard02-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard02.zip",
 }
@@ -4868,10 +6331,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard03-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard03-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard03",
-    src: ":art-run-test-jvm-data-shard03-tmp",
+    src: ":art-run-test-jvm-data-shard03-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard03.zip",
 }
@@ -4887,10 +6357,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard04-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard04-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard04",
-    src: ":art-run-test-jvm-data-shard04-tmp",
+    src: ":art-run-test-jvm-data-shard04-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard04.zip",
 }
@@ -4906,10 +6383,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard05-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard05-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard05",
-    src: ":art-run-test-jvm-data-shard05-tmp",
+    src: ":art-run-test-jvm-data-shard05-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard05.zip",
 }
@@ -4925,10 +6409,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard06-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard06-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard06",
-    src: ":art-run-test-jvm-data-shard06-tmp",
+    src: ":art-run-test-jvm-data-shard06-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard06.zip",
 }
@@ -4944,10 +6435,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard07-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard07-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard07",
-    src: ":art-run-test-jvm-data-shard07-tmp",
+    src: ":art-run-test-jvm-data-shard07-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard07.zip",
 }
@@ -4963,10 +6461,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard08-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard08-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard08",
-    src: ":art-run-test-jvm-data-shard08-tmp",
+    src: ":art-run-test-jvm-data-shard08-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard08.zip",
 }
@@ -4982,10 +6487,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard09-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard09-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard09",
-    src: ":art-run-test-jvm-data-shard09-tmp",
+    src: ":art-run-test-jvm-data-shard09-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard09.zip",
 }
@@ -5001,10 +6513,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard10-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard10-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard10",
-    src: ":art-run-test-jvm-data-shard10-tmp",
+    src: ":art-run-test-jvm-data-shard10-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard10.zip",
 }
@@ -5020,10 +6539,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard11-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard11-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard11",
-    src: ":art-run-test-jvm-data-shard11-tmp",
+    src: ":art-run-test-jvm-data-shard11-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard11.zip",
 }
@@ -5039,10 +6565,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard12-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard12-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard12",
-    src: ":art-run-test-jvm-data-shard12-tmp",
+    src: ":art-run-test-jvm-data-shard12-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard12.zip",
 }
@@ -5058,10 +6591,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard13-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard13-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard13",
-    src: ":art-run-test-jvm-data-shard13-tmp",
+    src: ":art-run-test-jvm-data-shard13-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard13.zip",
 }
@@ -5077,10 +6617,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard14-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard14-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard14",
-    src: ":art-run-test-jvm-data-shard14-tmp",
+    src: ":art-run-test-jvm-data-shard14-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard14.zip",
 }
@@ -5096,10 +6643,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard15-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard15-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard15",
-    src: ":art-run-test-jvm-data-shard15-tmp",
+    src: ":art-run-test-jvm-data-shard15-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard15.zip",
 }
@@ -5115,10 +6669,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard16-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard16-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard16",
-    src: ":art-run-test-jvm-data-shard16-tmp",
+    src: ":art-run-test-jvm-data-shard16-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard16.zip",
 }
@@ -5134,10 +6695,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard17-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard17-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard17",
-    src: ":art-run-test-jvm-data-shard17-tmp",
+    src: ":art-run-test-jvm-data-shard17-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard17.zip",
 }
@@ -5153,10 +6721,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard18-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard18-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard18",
-    src: ":art-run-test-jvm-data-shard18-tmp",
+    src: ":art-run-test-jvm-data-shard18-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard18.zip",
 }
@@ -5172,10 +6747,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard19-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard19-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard19",
-    src: ":art-run-test-jvm-data-shard19-tmp",
+    src: ":art-run-test-jvm-data-shard19-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard19.zip",
 }
@@ -5191,10 +6773,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard20-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard20-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard20",
-    src: ":art-run-test-jvm-data-shard20-tmp",
+    src: ":art-run-test-jvm-data-shard20-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard20.zip",
 }
@@ -5210,10 +6799,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard21-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard21-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard21",
-    src: ":art-run-test-jvm-data-shard21-tmp",
+    src: ":art-run-test-jvm-data-shard21-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard21.zip",
 }
@@ -5229,10 +6825,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard22-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard22-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard22",
-    src: ":art-run-test-jvm-data-shard22-tmp",
+    src: ":art-run-test-jvm-data-shard22-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard22.zip",
 }
@@ -5248,10 +6851,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard23-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard23-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard23",
-    src: ":art-run-test-jvm-data-shard23-tmp",
+    src: ":art-run-test-jvm-data-shard23-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard23.zip",
 }
@@ -5267,10 +6877,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard24-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard24-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard24",
-    src: ":art-run-test-jvm-data-shard24-tmp",
+    src: ":art-run-test-jvm-data-shard24-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard24.zip",
 }
@@ -5286,10 +6903,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard25-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard25-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard25",
-    src: ":art-run-test-jvm-data-shard25-tmp",
+    src: ":art-run-test-jvm-data-shard25-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard25.zip",
 }
@@ -5305,10 +6929,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard26-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard26-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard26",
-    src: ":art-run-test-jvm-data-shard26-tmp",
+    src: ":art-run-test-jvm-data-shard26-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard26.zip",
 }
@@ -5324,10 +6955,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard27-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard27-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard27",
-    src: ":art-run-test-jvm-data-shard27-tmp",
+    src: ":art-run-test-jvm-data-shard27-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard27.zip",
 }
@@ -5343,10 +6981,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard28-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard28-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard28",
-    src: ":art-run-test-jvm-data-shard28-tmp",
+    src: ":art-run-test-jvm-data-shard28-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard28.zip",
 }
@@ -5362,10 +7007,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard29-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard29-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard29",
-    src: ":art-run-test-jvm-data-shard29-tmp",
+    src: ":art-run-test-jvm-data-shard29-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard29.zip",
 }
@@ -5381,10 +7033,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard30-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard30-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard30",
-    src: ":art-run-test-jvm-data-shard30-tmp",
+    src: ":art-run-test-jvm-data-shard30-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard30.zip",
 }
@@ -5400,10 +7059,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard31-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard31-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard31",
-    src: ":art-run-test-jvm-data-shard31-tmp",
+    src: ":art-run-test-jvm-data-shard31-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard31.zip",
 }
@@ -5419,10 +7085,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard32-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard32-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard32",
-    src: ":art-run-test-jvm-data-shard32-tmp",
+    src: ":art-run-test-jvm-data-shard32-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard32.zip",
 }
@@ -5438,10 +7111,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard33-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard33-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard33",
-    src: ":art-run-test-jvm-data-shard33-tmp",
+    src: ":art-run-test-jvm-data-shard33-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard33.zip",
 }
@@ -5457,10 +7137,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard34-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard34-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard34",
-    src: ":art-run-test-jvm-data-shard34-tmp",
+    src: ":art-run-test-jvm-data-shard34-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard34.zip",
 }
@@ -5476,10 +7163,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard35-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard35-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard35",
-    src: ":art-run-test-jvm-data-shard35-tmp",
+    src: ":art-run-test-jvm-data-shard35-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard35.zip",
 }
@@ -5495,10 +7189,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard36-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard36-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard36",
-    src: ":art-run-test-jvm-data-shard36-tmp",
+    src: ":art-run-test-jvm-data-shard36-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard36.zip",
 }
@@ -5514,10 +7215,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard37-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard37-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard37",
-    src: ":art-run-test-jvm-data-shard37-tmp",
+    src: ":art-run-test-jvm-data-shard37-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard37.zip",
 }
@@ -5533,10 +7241,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard38-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard38-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard38",
-    src: ":art-run-test-jvm-data-shard38-tmp",
+    src: ":art-run-test-jvm-data-shard38-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard38.zip",
 }
@@ -5552,10 +7267,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard39-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard39-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard39",
-    src: ":art-run-test-jvm-data-shard39-tmp",
+    src: ":art-run-test-jvm-data-shard39-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard39.zip",
 }
@@ -5571,10 +7293,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard40-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard40-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard40",
-    src: ":art-run-test-jvm-data-shard40-tmp",
+    src: ":art-run-test-jvm-data-shard40-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard40.zip",
 }
@@ -5590,10 +7319,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard41-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard41-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard41",
-    src: ":art-run-test-jvm-data-shard41-tmp",
+    src: ":art-run-test-jvm-data-shard41-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard41.zip",
 }
@@ -5609,10 +7345,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard42-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard42-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard42",
-    src: ":art-run-test-jvm-data-shard42-tmp",
+    src: ":art-run-test-jvm-data-shard42-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard42.zip",
 }
@@ -5628,10 +7371,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard43-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard43-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard43",
-    src: ":art-run-test-jvm-data-shard43-tmp",
+    src: ":art-run-test-jvm-data-shard43-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard43.zip",
 }
@@ -5647,10 +7397,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard44-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard44-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard44",
-    src: ":art-run-test-jvm-data-shard44-tmp",
+    src: ":art-run-test-jvm-data-shard44-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard44.zip",
 }
@@ -5666,10 +7423,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard45-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard45-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard45",
-    src: ":art-run-test-jvm-data-shard45-tmp",
+    src: ":art-run-test-jvm-data-shard45-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard45.zip",
 }
@@ -5685,10 +7449,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard46-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard46-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard46",
-    src: ":art-run-test-jvm-data-shard46-tmp",
+    src: ":art-run-test-jvm-data-shard46-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard46.zip",
 }
@@ -5704,10 +7475,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard47-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard47-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard47",
-    src: ":art-run-test-jvm-data-shard47-tmp",
+    src: ":art-run-test-jvm-data-shard47-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard47.zip",
 }
@@ -5723,10 +7501,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard48-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard48-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard48",
-    src: ":art-run-test-jvm-data-shard48-tmp",
+    src: ":art-run-test-jvm-data-shard48-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard48.zip",
 }
@@ -5742,10 +7527,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard49-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard49-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard49",
-    src: ":art-run-test-jvm-data-shard49-tmp",
+    src: ":art-run-test-jvm-data-shard49-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard49.zip",
 }
@@ -5761,10 +7553,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard50-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard50-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard50",
-    src: ":art-run-test-jvm-data-shard50-tmp",
+    src: ":art-run-test-jvm-data-shard50-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard50.zip",
 }
@@ -5780,10 +7579,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard51-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard51-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard51",
-    src: ":art-run-test-jvm-data-shard51-tmp",
+    src: ":art-run-test-jvm-data-shard51-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard51.zip",
 }
@@ -5799,10 +7605,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard52-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard52-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard52",
-    src: ":art-run-test-jvm-data-shard52-tmp",
+    src: ":art-run-test-jvm-data-shard52-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard52.zip",
 }
@@ -5818,10 +7631,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard53-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard53-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard53",
-    src: ":art-run-test-jvm-data-shard53-tmp",
+    src: ":art-run-test-jvm-data-shard53-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard53.zip",
 }
@@ -5837,10 +7657,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard54-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard54-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard54",
-    src: ":art-run-test-jvm-data-shard54-tmp",
+    src: ":art-run-test-jvm-data-shard54-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard54.zip",
 }
@@ -5856,10 +7683,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard55-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard55-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard55",
-    src: ":art-run-test-jvm-data-shard55-tmp",
+    src: ":art-run-test-jvm-data-shard55-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard55.zip",
 }
@@ -5875,10 +7709,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard56-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard56-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard56",
-    src: ":art-run-test-jvm-data-shard56-tmp",
+    src: ":art-run-test-jvm-data-shard56-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard56.zip",
 }
@@ -5894,10 +7735,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard57-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard57-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard57",
-    src: ":art-run-test-jvm-data-shard57-tmp",
+    src: ":art-run-test-jvm-data-shard57-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard57.zip",
 }
@@ -5913,10 +7761,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard58-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard58-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard58",
-    src: ":art-run-test-jvm-data-shard58-tmp",
+    src: ":art-run-test-jvm-data-shard58-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard58.zip",
 }
@@ -5932,10 +7787,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard59-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard59-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard59",
-    src: ":art-run-test-jvm-data-shard59-tmp",
+    src: ":art-run-test-jvm-data-shard59-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard59.zip",
 }
@@ -5951,10 +7813,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard60-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard60-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard60",
-    src: ":art-run-test-jvm-data-shard60-tmp",
+    src: ":art-run-test-jvm-data-shard60-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard60.zip",
 }
@@ -5970,10 +7839,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard61-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard61-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard61",
-    src: ":art-run-test-jvm-data-shard61-tmp",
+    src: ":art-run-test-jvm-data-shard61-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard61.zip",
 }
@@ -5989,10 +7865,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard62-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard62-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard62",
-    src: ":art-run-test-jvm-data-shard62-tmp",
+    src: ":art-run-test-jvm-data-shard62-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard62.zip",
 }
@@ -6008,10 +7891,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard63-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard63-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard63",
-    src: ":art-run-test-jvm-data-shard63-tmp",
+    src: ":art-run-test-jvm-data-shard63-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard63.zip",
 }
@@ -6027,10 +7917,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard64-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard64-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard64",
-    src: ":art-run-test-jvm-data-shard64-tmp",
+    src: ":art-run-test-jvm-data-shard64-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard64.zip",
 }
@@ -6046,10 +7943,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard65-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard65-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard65",
-    src: ":art-run-test-jvm-data-shard65-tmp",
+    src: ":art-run-test-jvm-data-shard65-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard65.zip",
 }
@@ -6065,10 +7969,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard66-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard66-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard66",
-    src: ":art-run-test-jvm-data-shard66-tmp",
+    src: ":art-run-test-jvm-data-shard66-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard66.zip",
 }
@@ -6084,10 +7995,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard67-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard67-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard67",
-    src: ":art-run-test-jvm-data-shard67-tmp",
+    src: ":art-run-test-jvm-data-shard67-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard67.zip",
 }
@@ -6103,10 +8021,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard68-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard68-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard68",
-    src: ":art-run-test-jvm-data-shard68-tmp",
+    src: ":art-run-test-jvm-data-shard68-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard68.zip",
 }
@@ -6122,10 +8047,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard69-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard69-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard69",
-    src: ":art-run-test-jvm-data-shard69-tmp",
+    src: ":art-run-test-jvm-data-shard69-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard69.zip",
 }
@@ -6141,10 +8073,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard70-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard70-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard70",
-    src: ":art-run-test-jvm-data-shard70-tmp",
+    src: ":art-run-test-jvm-data-shard70-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard70.zip",
 }
@@ -6160,10 +8099,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard71-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard71-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard71",
-    src: ":art-run-test-jvm-data-shard71-tmp",
+    src: ":art-run-test-jvm-data-shard71-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard71.zip",
 }
@@ -6179,10 +8125,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard72-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard72-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard72",
-    src: ":art-run-test-jvm-data-shard72-tmp",
+    src: ":art-run-test-jvm-data-shard72-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard72.zip",
 }
@@ -6198,10 +8151,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard73-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard73-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard73",
-    src: ":art-run-test-jvm-data-shard73-tmp",
+    src: ":art-run-test-jvm-data-shard73-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard73.zip",
 }
@@ -6217,10 +8177,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard74-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard74-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard74",
-    src: ":art-run-test-jvm-data-shard74-tmp",
+    src: ":art-run-test-jvm-data-shard74-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard74.zip",
 }
@@ -6236,10 +8203,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard75-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard75-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard75",
-    src: ":art-run-test-jvm-data-shard75-tmp",
+    src: ":art-run-test-jvm-data-shard75-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard75.zip",
 }
@@ -6255,10 +8229,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard76-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard76-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard76",
-    src: ":art-run-test-jvm-data-shard76-tmp",
+    src: ":art-run-test-jvm-data-shard76-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard76.zip",
 }
@@ -6274,10 +8255,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard77-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard77-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard77",
-    src: ":art-run-test-jvm-data-shard77-tmp",
+    src: ":art-run-test-jvm-data-shard77-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard77.zip",
 }
@@ -6293,10 +8281,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard78-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard78-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard78",
-    src: ":art-run-test-jvm-data-shard78-tmp",
+    src: ":art-run-test-jvm-data-shard78-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard78.zip",
 }
@@ -6312,10 +8307,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard79-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard79-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard79",
-    src: ":art-run-test-jvm-data-shard79-tmp",
+    src: ":art-run-test-jvm-data-shard79-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard79.zip",
 }
@@ -6331,10 +8333,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard80-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard80-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard80",
-    src: ":art-run-test-jvm-data-shard80-tmp",
+    src: ":art-run-test-jvm-data-shard80-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard80.zip",
 }
@@ -6350,10 +8359,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard81-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard81-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard81",
-    src: ":art-run-test-jvm-data-shard81-tmp",
+    src: ":art-run-test-jvm-data-shard81-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard81.zip",
 }
@@ -6369,10 +8385,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard82-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard82-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard82",
-    src: ":art-run-test-jvm-data-shard82-tmp",
+    src: ":art-run-test-jvm-data-shard82-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard82.zip",
 }
@@ -6388,10 +8411,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard83-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard83-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard83",
-    src: ":art-run-test-jvm-data-shard83-tmp",
+    src: ":art-run-test-jvm-data-shard83-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard83.zip",
 }
@@ -6407,10 +8437,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard84-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard84-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard84",
-    src: ":art-run-test-jvm-data-shard84-tmp",
+    src: ":art-run-test-jvm-data-shard84-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard84.zip",
 }
@@ -6426,10 +8463,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard85-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard85-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard85",
-    src: ":art-run-test-jvm-data-shard85-tmp",
+    src: ":art-run-test-jvm-data-shard85-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard85.zip",
 }
@@ -6445,10 +8489,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard86-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard86-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard86",
-    src: ":art-run-test-jvm-data-shard86-tmp",
+    src: ":art-run-test-jvm-data-shard86-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard86.zip",
 }
@@ -6464,10 +8515,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard87-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard87-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard87",
-    src: ":art-run-test-jvm-data-shard87-tmp",
+    src: ":art-run-test-jvm-data-shard87-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard87.zip",
 }
@@ -6483,10 +8541,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard88-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard88-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard88",
-    src: ":art-run-test-jvm-data-shard88-tmp",
+    src: ":art-run-test-jvm-data-shard88-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard88.zip",
 }
@@ -6502,10 +8567,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard89-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard89-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard89",
-    src: ":art-run-test-jvm-data-shard89-tmp",
+    src: ":art-run-test-jvm-data-shard89-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard89.zip",
 }
@@ -6521,10 +8593,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard90-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard90-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard90",
-    src: ":art-run-test-jvm-data-shard90-tmp",
+    src: ":art-run-test-jvm-data-shard90-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard90.zip",
 }
@@ -6540,10 +8619,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard91-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard91-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard91",
-    src: ":art-run-test-jvm-data-shard91-tmp",
+    src: ":art-run-test-jvm-data-shard91-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard91.zip",
 }
@@ -6559,10 +8645,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard92-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard92-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard92",
-    src: ":art-run-test-jvm-data-shard92-tmp",
+    src: ":art-run-test-jvm-data-shard92-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard92.zip",
 }
@@ -6578,10 +8671,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard93-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard93-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard93",
-    src: ":art-run-test-jvm-data-shard93-tmp",
+    src: ":art-run-test-jvm-data-shard93-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard93.zip",
 }
@@ -6597,10 +8697,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard94-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard94-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard94",
-    src: ":art-run-test-jvm-data-shard94-tmp",
+    src: ":art-run-test-jvm-data-shard94-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard94.zip",
 }
@@ -6616,10 +8723,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard95-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard95-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard95",
-    src: ":art-run-test-jvm-data-shard95-tmp",
+    src: ":art-run-test-jvm-data-shard95-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard95.zip",
 }
@@ -6635,10 +8749,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard96-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard96-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard96",
-    src: ":art-run-test-jvm-data-shard96-tmp",
+    src: ":art-run-test-jvm-data-shard96-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard96.zip",
 }
@@ -6654,10 +8775,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard97-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard97-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard97",
-    src: ":art-run-test-jvm-data-shard97-tmp",
+    src: ":art-run-test-jvm-data-shard97-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard97.zip",
 }
@@ -6673,10 +8801,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard98-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard98-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard98",
-    src: ":art-run-test-jvm-data-shard98-tmp",
+    src: ":art-run-test-jvm-data-shard98-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard98.zip",
 }
@@ -6692,10 +8827,17 @@ java_genrule {
     defaults: ["art-run-test-jvm-data-defaults"],
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shard99-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shard99-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shard99",
-    src: ":art-run-test-jvm-data-shard99-tmp",
+    src: ":art-run-test-jvm-data-shard99-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shard99.zip",
 }
@@ -6712,10 +8854,17 @@ java_genrule {
     cmd: TEST_BUILD_COMMON_ARGS + "--hiddenapi $(location hiddenapi) --mode jvm --test-dir-regex 'art/test/....?-[^/]*hiddenapi' $(in)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-shardHiddenApi-fg",
+    device_common_srcs: [":art-run-test-jvm-data-shardHiddenApi-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-shardHiddenApi",
-    src: ":art-run-test-jvm-data-shardHiddenApi-tmp",
+    src: ":art-run-test-jvm-data-shardHiddenApi-fg",
     sub_dir: "art",
     filename: "art-run-test-jvm-data-shardHiddenApi.zip",
 }
@@ -6863,10 +9012,17 @@ java_genrule {
     cmd: "$(location merge_zips) $(out) $(in)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-merged-fg",
+    device_common_srcs: [":art-run-test-jvm-data-merged-tmp"],
+}
+
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
     name: "art-run-test-jvm-data-merged",
-    src: ":art-run-test-jvm-data-merged-tmp",
+    src: ":art-run-test-jvm-data-merged-fg",
     required: [
         "art-run-test-jvm-data-shard00",
         "art-run-test-jvm-data-shard01",
@@ -7084,10 +9240,17 @@ java_genrule {
     cmd: "echo $(in) > $(out)",
 }
 
+// This filegroup is so that the host prebuilt etc can depend on a device genrule,
+// as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+filegroup {
+    name: "art-run-test-jvm-data-fg",
+    device_common_srcs: [":art-run-test-jvm-data-tmp"],
+}
+
 // Phony target used to install all shards
 prebuilt_etc_host {
     name: "art-run-test-jvm-data",
-    src: ":art-run-test-jvm-data-tmp",
+    src: ":art-run-test-jvm-data-fg",
     required: [
         "art-run-test-jvm-data-shard00",
         "art-run-test-jvm-data-shard01",
diff --git a/test/Android.run-test.bp.py b/test/Android.run-test.bp.py
index ac121127e1..ef422b1a0b 100755
--- a/test/Android.run-test.bp.py
+++ b/test/Android.run-test.bp.py
@@ -58,10 +58,17 @@ def main():
               defaults: ["art-run-test-{mode}-data-defaults"],
           }}
 
+          // This filegroup is so that the host prebuilt etc can depend on a device genrule,
+          // as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+          filegroup {{
+              name: "{name}-fg",
+              device_common_srcs: [":{name}-tmp"],
+          }}
+
           // Install in the output directory to make it accessible for tests.
           prebuilt_etc_host {{
               name: "{name}",
-              src: ":{name}-tmp",
+              src: ":{name}-fg",
               sub_dir: "art",
               filename: "{name}.zip",
           }}
@@ -85,10 +92,17 @@ def main():
             cmd: TEST_BUILD_COMMON_ARGS + "--hiddenapi $(location hiddenapi) --mode {mode} --test-dir-regex 'art/test/....?-[^/]*hiddenapi' $(in)",
         }}
 
+        // This filegroup is so that the host prebuilt etc can depend on a device genrule,
+        // as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+        filegroup {{
+            name: "{name}-fg",
+            device_common_srcs: [":{name}-tmp"],
+        }}
+
         // Install in the output directory to make it accessible for tests.
         prebuilt_etc_host {{
             name: "{name}",
-            src: ":{name}-tmp",
+            src: ":{name}-fg",
             sub_dir: "art",
             filename: "{name}.zip",
         }}
@@ -143,10 +157,17 @@ def main():
             cmd: "$(location merge_zips) $(out) $(in)",
         }}
 
+        // This filegroup is so that the host prebuilt etc can depend on a device genrule,
+        // as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+        filegroup {{
+            name: "{name}-fg",
+            device_common_srcs: [":{name}-tmp"],
+        }}
+
         // Install in the output directory to make it accessible for tests.
         prebuilt_etc_host {{
             name: "{name}",
-            src: ":{name}-tmp",
+            src: ":{name}-fg",
             required: [
                 {deps}
             ],
@@ -169,10 +190,17 @@ def main():
             cmd: "echo $(in) > $(out)",
         }}
 
+        // This filegroup is so that the host prebuilt etc can depend on a device genrule,
+        // as prebuilt_etc doesn't have the equivalent of device_common_srcs.
+        filegroup {{
+            name: "{name}-fg",
+            device_common_srcs: [":{name}-tmp"],
+        }}
+
         // Phony target used to install all shards
         prebuilt_etc_host {{
             name: "{name}",
-            src: ":{name}-tmp",
+            src: ":{name}-fg",
             required: [
                 {deps}
             ],
diff --git a/test/odsign/Android.bp b/test/odsign/Android.bp
index 5aa0f4d25a..948713aec1 100644
--- a/test/odsign/Android.bp
+++ b/test/odsign/Android.bp
@@ -32,7 +32,7 @@ java_test_host {
     defaults: ["odsign_e2e_tests_defaults"],
     // TODO(b/228838581): Do not add `data` to the defaults unless the bug is
     // fixed.
-    data: [
+    device_common_data: [
         ":odsign_e2e_test_app",
     ],
     test_config: "odsign-e2e-tests.xml",
@@ -48,10 +48,10 @@ java_test_host {
     defaults: ["odsign_e2e_tests_defaults"],
     // TODO(b/228838581): Do not add `data` to the defaults unless the bug is
     // fixed.
-    data: [
+    device_common_data: [
         ":odsign_e2e_test_app",
     ],
-    java_resources: [
+    device_common_java_resources: [
         ":art-gtest-jars-Main",
     ],
     test_config: "odsign-e2e-tests-full.xml",
diff --git a/test/update-rollback/Android.bp b/test/update-rollback/Android.bp
index 8bba8cfd24..e22865c1fb 100644
--- a/test/update-rollback/Android.bp
+++ b/test/update-rollback/Android.bp
@@ -21,7 +21,7 @@ java_test_host {
     srcs: ["src/**/*.java"],
     libs: ["tradefed"],
     static_libs: ["cts-install-lib-host"],
-    data: [":test_broken_com.android.art"],
+    device_common_data: [":test_broken_com.android.art"],
     // Add this test to `device-tests` rather than `general-tests` to ensure
     // that the type of ART APEX -- public (`com.android.art`) or internal
     // (`com.google.android.art`) -- used in the test matches the one bundled
diff --git a/tools/dexanalyze/Android.bp b/tools/dexanalyze/Android.bp
index 5b875594cf..819c9828f5 100644
--- a/tools/dexanalyze/Android.bp
+++ b/tools/dexanalyze/Android.bp
@@ -58,7 +58,7 @@ art_cc_test {
     defaults: [
         "art_gtest_defaults",
     ],
-    data: [
+    device_common_data: [
         ":art-gtest-jars-MultiDex",
     ],
     srcs: [
diff --git a/tools/fuzzer/Android.bp b/tools/fuzzer/Android.bp
index d2a4e25f09..45c4c4aad0 100644
--- a/tools/fuzzer/Android.bp
+++ b/tools/fuzzer/Android.bp
@@ -78,7 +78,7 @@ cc_defaults {
         },
     },
 
-    data: [
+    device_common_data: [
         ":core-oj",
         ":core-libart",
         ":okhttp",
@@ -96,7 +96,7 @@ cc_fuzz {
         "libart_static_defaults",
     ],
     // Can not be in defaults due to soong limitations.
-    corpus: [
+    device_common_corpus: [
         ":art_runtest_corpus",
         "dex-verifier-corpus/*",
     ],
@@ -109,7 +109,7 @@ cc_fuzz {
         "libartd_static_defaults",
     ],
     // Can not be in defaults due to soong limitations.
-    corpus: [
+    device_common_corpus: [
         ":art_runtest_corpus",
         "dex-verifier-corpus/*",
     ],
@@ -123,7 +123,7 @@ cc_fuzz {
         "libart_static_defaults",
     ],
     // Can not be in defaults due to soong limitations.
-    corpus: [
+    device_common_corpus: [
         ":art_runtest_corpus",
         "class-verifier-corpus/*",
     ],
@@ -134,7 +134,7 @@ cc_fuzz {
 // If test is modified or removed, remove the corresponding dex entry.
 // It is not strictly necessary to add new entries for new tests.
 // TODO(b/171429704): Remove this genrule and use the zip directly.
-genrule {
+java_genrule {
     name: "art_runtest_corpus",
     tool_files: ["create_corpus.py"],
     cmd: "$(location) $(genDir) $(in)",
diff --git a/tools/hiddenapi/Android.bp b/tools/hiddenapi/Android.bp
index 506197ce46..906e282df4 100644
--- a/tools/hiddenapi/Android.bp
+++ b/tools/hiddenapi/Android.bp
@@ -80,7 +80,7 @@ art_cc_test {
     defaults: [
         "art_gtest_defaults",
     ],
-    data: [
+    device_common_data: [
         ":art-gtest-jars-HiddenApi",
         ":art-gtest-jars-HiddenApiStubs",
     ],
diff --git a/tools/veridex/Android.bp b/tools/veridex/Android.bp
index ad1632b1ee..f069a02ee5 100644
--- a/tools/veridex/Android.bp
+++ b/tools/veridex/Android.bp
@@ -156,20 +156,17 @@ python_binary_host {
     srcs: ["appcompat.py"],
     data: [
         ":veridex",
-        ":platform-bootclasspath{hiddenapi-flags.csv}",
         ":org.apache.http.legacy-stubs.zip",
         ":system-stubs.zip",
     ],
-    version: {
-        py3: {
-            embedded_launcher: true,
-        },
-    },
+    device_common_data: [
+        ":platform-bootclasspath{hiddenapi-flags.csv}",
+    ],
 }
 
 // TODO: Remove `veridex_zip` and `appcompat.sh` after migrating
 //       `GtsUnofficialApisUsageTestCases` and `GtsNetUnofficialApisUsageTestCases` to use appcompat.
-genrule {
+java_genrule {
     name: "veridex_zip",
     srcs: [
         "appcompat.sh",