Use third_party/custom_tabs_client as the src for customtabs library

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

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
index 05068806b81d70effcc8389be559f46eca35dcf9..3fc395d72a837b6ef8dc1ed9ba04d03398e4820b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -9,6 +9,7 @@ import android.net.Uri;
 import android.os.IBinder;
 import android.support.customtabs.CustomTabsCallback;
 import android.support.customtabs.CustomTabsIntent;
+import android.support.customtabs.CustomTabsSessionToken;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
@@ -49,7 +50,7 @@ public class CustomTabActivity extends ChromeActivity {
     private CustomTab mTab;
     private FindToolbarManager mFindToolbarManager;
     private CustomTabIntentDataProvider mIntentDataProvider;
-    private IBinder mSession;
+    private CustomTabsSessionToken mSession;
     private CustomTabContentHandler mCustomTabContentHandler;
 
     // This is to give the right package name while using the client's resources during an
@@ -133,7 +134,7 @@ public class CustomTabActivity extends ChromeActivity {
         super.postInflationStartup();
         getToolbarManager().setCloseButtonDrawable(mIntentDataProvider.getCloseButtonDrawable());
         getToolbarManager().setShowTitle(mIntentDataProvider.getTitleVisibilityState()
-                == CustomTabIntentDataProvider.SHOW_PAGE_TITLE);
+                == CustomTabsIntent.SHOW_PAGE_TITLE);
         int toolbarColor = mIntentDataProvider.getToolbarColor();
         getToolbarManager().updatePrimaryColor(toolbarColor);
         if (toolbarColor != getResources().getColor(R.color.default_primary_color)) {
@@ -202,7 +203,7 @@ public class CustomTabActivity extends ChromeActivity {
             }
 
             @Override
-            public IBinder getSession() {
+            public CustomTabsSessionToken getSession() {
                 return mSession;
             }