Fix build files and roll custom_tabs_client

third_party/custom_tabs_client/custom_tabs_client.gyp

Index: third_party/custom_tabs_client/custom_tabs_client.gyp
diff --git a/third_party/custom_tabs_client/custom_tabs_client.gyp b/third_party/custom_tabs_client/custom_tabs_client.gyp
index 1294ecbff947f83ccf94db0ab33b2a21a7ec6d42..20d15cf08c34d999bd7bd3917309ed4f5be9e2c3 100644
--- a/third_party/custom_tabs_client/custom_tabs_client.gyp
+++ b/third_party/custom_tabs_client/custom_tabs_client.gyp
@@ -16,10 +16,23 @@
       },
       'dependencies': [
         'custom_tabs_support_lib',

[Ian Wen, 2015/08/19 20:30:51]

This dependency is not required anymore as shared_lib depends on support_lib as
well. Yet it is also more clear to have support_lib listed here. So it's up to
you. :)

[Yusuf, 2015/08/19 20:43:44]

Thanks. Yeah I would rather keep the dependencies clear in case we get rid of
the shared lib some day.

+        'custom_tabs_client_shared_lib',
       ],
       'includes': [ '../../build/java_apk.gypi' ],
     },
     {
+      'target_name': 'custom_tabs_client_shared_lib',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': 'src/shared/src/main/java/org/chromium/customtabsclient/shared/',
+        'java_in_dir_suffix': '',
+      },
+      'dependencies': [
+        'custom_tabs_support_lib',
+      ],
+      'includes': [ '../../build/java.gypi' ],
+    },
+    {
       'target_name': 'custom_tabs_support_lib',
       'type': 'none',
       'variables': {