Use third_party/custom_tabs_client as the src for customtabs library

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 5429060d9bc6269a609dd6fa5751a5fced7e0865..8a8afb2188db76eb6ee733359d604bd955b178ae 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -150,6 +150,7 @@ android_library("chrome_java") {
     "//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",
@@ -166,7 +167,6 @@ android_library("chrome_java") {
   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",
@@ -591,16 +591,6 @@ zip("chrome_version_srcjar") {
   ]
 }
 
-#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