Use third_party/custom_tabs_client as the src for customtabs library

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java
index 53312f14b1332038f4fc0bcbc76dc6f4cfca5aea..beebca3f21a0888c9125079a6a407c95c4db2f64 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java
@@ -7,10 +7,10 @@ package org.chromium.chrome.browser.customtabs;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
-import android.os.IBinder;
 import android.os.SystemClock;
 import android.os.TransactionTooLargeException;
 import android.support.customtabs.CustomTabsCallback;
+import android.support.customtabs.CustomTabsSessionToken;
 import android.text.TextUtils;
 import android.view.ContextMenu;
 import android.view.Menu;
@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
 public class CustomTab extends ChromeTab {
     private static class CustomTabObserver extends EmptyTabObserver {
         private CustomTabsConnection mCustomTabsConnection;
-        private IBinder mSession;
+        private CustomTabsSessionToken mSession;
         private long mIntentReceivedTimestamp;
         private long mPageLoadStartedTimestamp;
 
@@ -55,7 +55,8 @@ public class CustomTab extends ChromeTab {
         private static final int STATE_WAITING_LOAD_FINISH = 2;
         private int mCurrentState;
 
-        public CustomTabObserver(CustomTabsConnection customTabsConnection, IBinder session) {
+        public CustomTabObserver(
+                CustomTabsConnection customTabsConnection, CustomTabsSessionToken session) {
             mCustomTabsConnection = customTabsConnection;
             mSession = session;
             resetPageLoadTracking();
@@ -158,8 +159,9 @@ public class CustomTab extends ChromeTab {
      * prerendered web contents if it exists. It might load a prerendered {@link WebContents} for
      * the URL, if {@link CustomTabsConnectionService} has successfully warmed up for the url.
      */
-    public CustomTab(ChromeActivity activity, WindowAndroid windowAndroid, IBinder session,
-            String url, String referrer, int parentTabId, boolean enableUrlBarHiding) {
+    public CustomTab(ChromeActivity activity, WindowAndroid windowAndroid,
+            CustomTabsSessionToken session, String url, String referrer,
+            int parentTabId, boolean enableUrlBarHiding) {
         super(TabIdManager.getInstance().generateValidId(Tab.INVALID_TAB_ID), activity, false,
                 windowAndroid, TabLaunchType.FROM_EXTERNAL_APP, parentTabId, null, null);
         mEnableUrlBarHiding = enableUrlBarHiding;