Work around the build error on odsign_e2e_tests_defaults.

The build error is caused by a bug in Soong (b/228838581). This CL works
around it by moving `data` from the defaults to the inheriting modules.

Also, replaces art_module_java_defaults with java_defaults since the
soong_config variable stuff are already inherited via
art_module_source_build_java_defaults.

Bug: 219695818
Bug: 219698071
Bug: 219697768
Bug: 220604681
Bug: 218721247
Test: vendor/google/modules/ArtGoogle/build-with-prebuilt-art-module.sh
Change-Id: I88270565639642ecae55bf8f2b2b47b76e156025
diff --git a/test/odsign/Android.bp b/test/odsign/Android.bp
index c3cccd3..511f5a1 100644
--- a/test/odsign/Android.bp
+++ b/test/odsign/Android.bp
@@ -16,14 +16,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
-soong_config_module_type_import {
-    from: "art/build/SoongConfig.bp",
-    module_types: [
-        "art_module_java_defaults",
-    ],
-}
-
-art_module_java_defaults {
+java_defaults {
     name: "odsign_e2e_tests_defaults",
     defaults: ["art_module_source_build_java_defaults"],
     srcs: ["test-src/**/*.java"],
@@ -32,14 +25,16 @@
         "cts-install-lib-host",
         "frameworks-base-hostutils",
     ],
-    data: [
-        ":odsign_e2e_test_app",
-    ],
 }
 
 java_test_host {
     name: "odsign_e2e_tests",
     defaults: ["odsign_e2e_tests_defaults"],
+    // TODO(b/228838581): Do not add `data` to the defaults unless the bug is
+    // fixed.
+    data: [
+        ":odsign_e2e_test_app",
+    ],
     test_config: "odsign-e2e-tests.xml",
     test_suites: [
         "general-tests",
@@ -50,6 +45,11 @@
 java_test_host {
     name: "odsign_e2e_tests_full",
     defaults: ["odsign_e2e_tests_defaults"],
+    // TODO(b/228838581): Do not add `data` to the defaults unless the bug is
+    // fixed.
+    data: [
+        ":odsign_e2e_test_app",
+    ],
     test_config: "odsign-e2e-tests-full.xml",
     test_suites: [
         "general-tests",