Making webapk service java appear in only one .jar

chrome/android/webapk/libs/client/BUILD.gn

Index: chrome/android/webapk/libs/client/BUILD.gn
diff --git a/chrome/android/webapk/libs/client/BUILD.gn b/chrome/android/webapk/libs/client/BUILD.gn
index 57d4a97f6ee053c35f8c8a8ba91022c9cb48253b..b0b7cd9e2652b03bc3693cf2d2253818009292b5 100644
--- a/chrome/android/webapk/libs/client/BUILD.gn
+++ b/chrome/android/webapk/libs/client/BUILD.gn
@@ -14,11 +14,9 @@ android_library("client_java") {
   ]
   deps = [
     "//chrome/android/webapk/libs/common:common_java",
+    "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
   ]
-  srcjar_deps = [
-    ":runtime_library_version_java",
-    "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl",
-  ]
+  srcjar_deps = [ ":runtime_library_version_java" ]
 }
 
 java_cpp_template("runtime_library_version_java") {
@@ -37,5 +35,6 @@ junit_binary("webapk_client_junit_tests") {
   deps = [
     ":client_java",
     "//base:base_junit_test_support",
+    "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
   ]
 }