Specify dependencies in the data property

Bug: 269138674
Test: Presubmit
Change-Id: Iebbc0380733ddbb6a130c63520854a48d7655511
diff --git a/test/hidl_test/Android.bp b/test/hidl_test/Android.bp
index e90ff4e..f5336e7 100644
--- a/test/hidl_test/Android.bp
+++ b/test/hidl_test/Android.bp
@@ -12,7 +12,7 @@
     main: "hidl_test.py",
     srcs: ["hidl_test.py"],
     test_config: "hidl_test.xml",
-    target_required: [
+    data_device_bins_both: [
         "hidl_test_client",
         "hidl_test_servers",
     ],
diff --git a/test/java_test/Android.bp b/test/java_test/Android.bp
index 0d23ee7..ec34d74 100644
--- a/test/java_test/Android.bp
+++ b/test/java_test/Android.bp
@@ -12,10 +12,6 @@
     main: "hidl_test_java.py",
     srcs: ["hidl_test_java.py"],
     test_config: "hidl_test_java.xml",
-    target_required: [
-        "hidl_test_java_native",
-        "hidl_test_java_java",
-    ],
     test_suites: [
         "general-tests",
         "vts",
@@ -24,6 +20,9 @@
         unit_test: false,
     },
     data_device_bins_both: ["hidl_test_java_native"],
+    data: [
+        ":hidl_test_java_java",
+    ],
 }
 
 cc_test {