Use third_party/custom_tabs_client as the src for customtabs library

chrome/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 132 matching lines @@
     "//third_party/android_swipe_refresh:android_swipe_refresh_java",
     "//third_party/android_tools:android_gcm_java",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/android_tools:android_support_v7_mediarouter_resources",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
+    "//third_party/custom_tabs_client:custom_tabs_support_lib",
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/WebKit/public:blink_headers_java",
     "//media/base/android:media_java",
     "//media/midi:midi_java",
     "//ui/android:ui_java",
     "//ui/android:ui_java_resources",
     google_play_services_library,
   ]
 
   if (android_sdk_version != "M") {
     deps += [ "//third_party/android_tools:preview_java_sources" ]
   }
 
   srcjar_deps = [
     ":chrome_android_java_enums_srcjar",
     ":chrome_version_srcjar",
-    ":custom_tabs_service_aidl",
     ":resource_id_javagen",
     "//chrome:page_info_connection_type_javagen",
     "//chrome:content_setting_javagen",
     "//chrome:content_settings_type_javagen",
     "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar",
     "//components/offline_pages:offline_pages_enums_java",
   ]
 
   DEPRECATED_java_in_dir = "java/src"
 }
@@ skipping 404 matching lines @@
   inputs = [
     chrome_version_java_file,
   ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
   deps = [
     ":chrome_version_java",
   ]
 }
 
-#GYP: //chrome/android/chrome_apk.gyp:custom_tabs_service_aidl
-android_aidl("custom_tabs_service_aidl") {
-  import_include = "java/src/android/support/customtabs"
-  interface_file = "java/src/android/support/customtabs/common.aidl"
-  sources = [
-    "java/src/android/support/customtabs/ICustomTabsCallback.aidl",
-    "java/src/android/support/customtabs/ICustomTabsService.aidl",
-  ]
-}
-
 # GYP: //chrome/android/chrome_apk.gyp:chrome_shared_test_java
 android_library("chrome_shared_test_java") {
   testonly = true
   DEPRECATED_java_in_dir = "javatests/src"
 
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_java_resources",
@@ skipping 135 matching lines @@
   # TODO(GYP,cjhopman): Does this need version code/name?
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     ":chrome_public_test_apk_manifest",
     "//chrome/android:chrome_shared_test_java",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
 }