Fix java target naming exceptions in third_party/

third_party/custom_tabs_client/BUILD.gn

Index: third_party/custom_tabs_client/BUILD.gn
diff --git a/third_party/custom_tabs_client/BUILD.gn b/third_party/custom_tabs_client/BUILD.gn
index d73be4fefa06ca50014a477097a54e3ab715d434..0e38919c229e6a2b8d03a0bcde31359a5dd94289 100644
--- a/third_party/custom_tabs_client/BUILD.gn
+++ b/third_party/custom_tabs_client/BUILD.gn
@@ -20,14 +20,14 @@ android_apk("custom_tabs_client_example_apk") {
   apk_name = "CustomTabsClientExample"
   deps = [
     ":chrome_tabs_client_example_apk_resources",
-    ":custom_tabs_client_shared_lib",
-    ":custom_tabs_support_lib",
+    ":custom_tabs_client_shared_java",
+    ":custom_tabs_support_java",
     "//third_party/android_tools:android_support_annotations_java",
   ]
   chromium_code = false
 }
 
-android_library("custom_tabs_client_shared_lib") {
+android_library("custom_tabs_client_shared_java") {
   java_files = [
     "src/shared/src/main/java/org/chromium/customtabsclient/shared/CustomTabsHelper.java",
     "src/shared/src/main/java/org/chromium/customtabsclient/shared/KeepAliveService.java",
@@ -36,12 +36,19 @@ android_library("custom_tabs_client_shared_lib") {
   ]
 
   deps = [
-    ":custom_tabs_support_lib",
+    ":custom_tabs_support_java",
   ]
   chromium_code = true
 }
 
-android_library("custom_tabs_support_lib") {
+# TODO(agrieve): Delete once no longer referenced downstream.
+java_group("custom_tabs_support_lib") {
+  deps = [
+    ":custom_tabs_support_java",
+  ]
+}
+
+android_library("custom_tabs_support_java") {
   java_files = [
     "src/customtabs/src/android/support/customtabs/CustomTabsCallback.java",
     "src/customtabs/src/android/support/customtabs/CustomTabsClient.java",