diff --git a/.gitignore b/.gitignore
index d868401753b1ec..06bab17c5266eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@
 !Android.mk
 .*.sw?
 .DS_Store
+.cipd
 .classpath
 .cproject
 .gdb_history
diff --git a/DEPS b/DEPS
index 11442b20735395..7e2f216270726e 100644
--- a/DEPS
+++ b/DEPS
@@ -953,199 +953,17 @@ hooks_os = {
       ],
     },
     {
-      'name': 'android_system_sdk',
+      'name': 'Android CIPD Ensure',
       'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'android_system_stubs',
-                 '-l', 'third_party/android_system_sdk'
-      ],
-    },
-    {
-      'name': 'intellij',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-intellij',
-                 '-l', 'third_party/intellij'
-      ],
-    },
-    {
-      'name': 'javax_inject',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-javax-inject',
-                 '-l', 'third_party/javax_inject'
-      ],
-    },
-    {
-      'name': 'hamcrest',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-hamcrest',
-                 '-l', 'third_party/hamcrest'
-      ],
-    },
-    {
-      'name': 'guava',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-guava',
-                 '-l', 'third_party/guava'
-      ],
-    },
-    {
-      'name': 'android_support_test_runner',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-android-support-test-runner',
-                 '-l', 'third_party/android_support_test_runner'
-      ],
-    },
-    {
-      'name': 'byte_buddy',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-byte-buddy',
-                 '-l', 'third_party/byte_buddy'
-      ],
-    },
-    {
-      'name': 'espresso',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-espresso',
-                 '-l', 'third_party/espresso'
-      ],
-    },
-    {
-      'name': 'robolectric_libs',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-robolectric',
-                 '-l', 'third_party/robolectric'
-      ],
-    },
-    {
-      'name': 'apache_velocity',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-apache-velocity',
-                 '-l', 'third_party/apache_velocity'
-      ],
-    },
-    {
-      'name': 'ow2_asm',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-ow2-asm',
-                 '-l', 'third_party/ow2_asm'
-      ],
-    },
-    {
-      'name': 'desugar',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-android-tools/bazel/desugar',
-                 '-l', 'third_party/bazel/desugar'
-      ],
-    },
-    {
-      'name': 'apk-patch-size-estimator',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-android-tools/apk-patch-size-estimator',
-                 '-l', 'third_party/apk-patch-size-estimator/lib'
-      ],
-    },
-    {
-      'name': 'icu4j',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-icu4j',
-                 '-l', 'third_party/icu4j'
-      ],
-    },
-    {
-      'name': 'accessibility_test_framework',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-accessibility-test-framework',
-                 '-l', 'third_party/accessibility_test_framework'
-      ],
-    },
-    {
-      'name': 'bouncycastle',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-bouncycastle',
-                 '-l', 'third_party/bouncycastle'
-      ],
-    },
-    {
-      'name': 'sqlite4java',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-sqlite4java',
-                 '-l', 'third_party/sqlite4java'
-      ],
-    },
-    {
-      'name': 'objenesis',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-objenesis',
-                 '-l', 'third_party/objenesis'
-      ],
-    },
-    {
-      'name': 'xstream',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-robolectric',
-                 '-l', 'third_party/xstream'
+      'action': ['src/build/cipd/cipd_wrapper.py',
+                 '--chromium-root', 'src',
+                 '--target-os', 'android',
       ],
     },
     {
       'name': 'gvr_static_shim_android_arm',
       'pattern': '\\.sha1',
-    'action': [   'python',
+      'action': [ 'python',
                   'src/third_party/depot_tools/download_from_google_storage.py',
                   '--no_resume',
                   '--platform=linux*',
@@ -1157,7 +975,7 @@ hooks_os = {
     {
       'name': 'gvr_static_shim_android_arm64',
       'pattern': '\\.sha1',
-    'action': [   'python',
+      'action': [ 'python',
                   'src/third_party/depot_tools/download_from_google_storage.py',
                   '--no_resume',
                   '--platform=linux*',
@@ -1169,7 +987,7 @@ hooks_os = {
     {
       'name': 'gvr_common_aar',
       'pattern': '\\.sha1',
-    'action': [   'python',
+      'action': [ 'python',
                   'src/third_party/depot_tools/download_from_google_storage.py',
                   '--no_resume',
                   '--platform=linux*',
@@ -1181,7 +999,7 @@ hooks_os = {
     {
       'name': 'vr_controller_test_api',
       'pattern': '\\.sha1',
-    'action': [   'python',
+      'action': [ 'python',
                   'src/third_party/depot_tools/download_from_google_storage.py',
                   '--no_resume',
                   '--platform=linux*',
diff --git a/build/android/gyp/copy_ex.py b/build/android/gyp/copy_ex.py
index 196cbcc288e1aa..a397259e922a8d 100755
--- a/build/android/gyp/copy_ex.py
+++ b/build/android/gyp/copy_ex.py
@@ -30,6 +30,11 @@ def CopyFile(f, dest, deps):
     shutil.copytree(f, os.path.join(dest, os.path.basename(f)))
     deps.extend(_get_all_files(f))
   else:
+    if os.path.exists(dest):
+      if os.path.isfile(dest):
+        os.remove(dest)
+      elif os.path.isfile(os.path.join(dest, os.path.basename(f))):
+        os.remove(os.path.join(dest, os.path.basename(f)))
     shutil.copy(f, dest)
     deps.append(f)
 
diff --git a/build/android/gyp/jar.py b/build/android/gyp/jar.py
index 2b19c587b78f03..58a12cdf9644b3 100755
--- a/build/android/gyp/jar.py
+++ b/build/android/gyp/jar.py
@@ -39,10 +39,11 @@ def Jar(class_files, classes_dir, jar_path, manifest_file=None,
 
     for filepath, jar_filepath in additional_files or []:
       full_jar_filepath = os.path.join(jar_cwd, jar_filepath)
-      jar_dir = os.path.dirname(full_jar_filepath)
-      if not os.path.exists(jar_dir):
-        os.makedirs(jar_dir)
-      shutil.copy(filepath, full_jar_filepath)
+      if not os.path.exists(full_jar_filepath):
+        jar_dir = os.path.dirname(full_jar_filepath)
+        if not os.path.exists(jar_dir):
+          os.makedirs(jar_dir)
+        shutil.copy(filepath, full_jar_filepath)
       jar_cmd.append(jar_filepath)
 
     if provider_configurations:
diff --git a/build/android/update_deps/update_third_party_deps.py b/build/android/update_deps/update_third_party_deps.py
deleted file mode 100755
index e0f3c8c234ff77..00000000000000
--- a/build/android/update_deps/update_third_party_deps.py
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2016 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.
-
-"""
-Uploads or downloads third party libraries to or from google cloud storage.
-
-This script will only work for Android checkouts.
-"""
-
-import argparse
-import logging
-import os
-import sys
-
-
-sys.path.append(os.path.abspath(
-    os.path.join(os.path.dirname(__file__), os.pardir)))
-from pylib import constants
-from pylib.constants import host_paths
-
-sys.path.append(os.path.abspath(
-    os.path.join(host_paths.DIR_SOURCE_ROOT, 'build')))
-import find_depot_tools  # pylint: disable=import-error,unused-import
-import download_from_google_storage
-import upload_to_google_storage
-
-
-def _AddBasicArguments(parser):
-  parser.add_argument(
-      '--sdk-root', default=constants.ANDROID_SDK_ROOT,
-      help='base path to the Android SDK root')
-  parser.add_argument(
-      '-v', '--verbose', action='store_true', help='print debug information')
-  parser.add_argument(
-      '-b', '--bucket-path', required=True,
-      help='The path of the lib file in Google Cloud Storage.')
-  parser.add_argument(
-      '-l', '--local-path', required=True,
-      help='The base path of the third_party directory')
-
-
-def _CheckPaths(bucket_path, local_path):
-  if bucket_path.startswith('gs://'):
-    bucket_url = bucket_path
-  else:
-    bucket_url = 'gs://%s' % bucket_path
-  local_path = os.path.join(host_paths.DIR_SOURCE_ROOT, local_path)
-  if not os.path.isdir(local_path):
-    raise IOError(
-        'The library local path is not a valid directory: %s' % local_path)
-  return bucket_url, local_path
-
-
-def _CheckFileList(local_path, file_list):
-  local_path = os.path.abspath(local_path)
-  abs_path_list = [os.path.abspath(f) for f in file_list]
-  for f in abs_path_list:
-    if os.path.commonprefix([f, local_path]) != local_path:
-      raise IOError(
-          '%s in the arguments is not descendant of the specified directory %s'
-          % (f, local_path))
-  return abs_path_list
-
-
-def Upload(arguments):
-  """Upload files in a third_party directory to google storage"""
-  bucket_url, local_path = _CheckPaths(arguments.bucket_path,
-                                       arguments.local_path)
-  file_list = _CheckFileList(local_path, arguments.file_list)
-  upload_to_google_storage.upload_to_google_storage(
-      input_filenames=file_list,
-      base_url=bucket_url,
-      gsutil=arguments.gsutil,
-      force=False,
-      use_md5=False,
-      num_threads=1,
-      skip_hashing=False,
-      gzip=None)
-
-
-def Download(arguments):
-  """Download files based on sha1 files in a third_party dir from gcs"""
-  bucket_url, local_path = _CheckPaths(arguments.bucket_path,
-                                       arguments.local_path)
-  download_from_google_storage.download_from_google_storage(
-      local_path,
-      bucket_url,
-      gsutil=arguments.gsutil,
-      num_threads=1,
-      directory=True,
-      recursive=True,
-      force=False,
-      output=None,
-      ignore_errors=False,
-      sha1_file=None,
-      verbose=arguments.verbose,
-      auto_platform=False,
-      extract=False)
-
-
-def main(argv):
-  parser = argparse.ArgumentParser()
-  subparsers = parser.add_subparsers(title='commands')
-  download_parser = subparsers.add_parser(
-      'download', help='download the library from the cloud storage')
-  _AddBasicArguments(download_parser)
-  download_parser.set_defaults(func=Download)
-
-  upload_parser = subparsers.add_parser(
-      'upload', help='find all jar files in a third_party directory and ' +
-                     'upload them to cloud storage')
-  _AddBasicArguments(upload_parser)
-  upload_parser.set_defaults(func=Upload)
-  upload_parser.add_argument(
-      '-f', '--file-list', nargs='+', required=True,
-      help='A list of base paths for files in third_party to upload.')
-
-  arguments = parser.parse_args(argv)
-  if not os.path.isdir(arguments.sdk_root):
-    logging.debug('Did not find the Android SDK root directory at "%s".',
-                  arguments.sdk_root)
-    logging.info('Skipping, not on an android checkout.')
-    return 0
-
-  arguments.gsutil = download_from_google_storage.Gsutil(
-      download_from_google_storage.GSUTIL_DEFAULT_PATH)
-  return arguments.func(arguments)
-
-
-if __name__ == '__main__':
-  sys.exit(main(sys.argv[1:]))
diff --git a/build/cipd/android/android.ensure b/build/cipd/android/android.ensure
new file mode 100644
index 00000000000000..4a643a6eeb1e19
--- /dev/null
+++ b/build/cipd/android/android.ensure
@@ -0,0 +1,60 @@
+# Copyright 2017 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.
+
+# Dependencies for Android target OS.
+
+@Subdir third_party/accessibility_test_framework
+chromium/third_party/accessibility-test-framework version:2.1
+
+@Subdir third_party/android_support_test_runner
+chromium/third_party/android_support_test_runner version:0.5
+
+@Subdir third_party/android_system_sdk
+chromium/third_party/android_system_sdk version:0
+
+@Subdir third_party/apk-patch-size-estimator
+chromium/third_party/apk-patch-size-estimator version:0.2
+
+@Subdir third_party/bazel
+chromium/third_party/bazel version:0
+
+@Subdir third_party/bouncycastle
+chromium/third_party/bouncycastle version:1.46
+
+@Subdir third_party/byte_buddy
+chromium/third_party/byte_buddy version:1.4.17
+
+@Subdir third_party/espresso
+chromium/third_party/espresso version:2.2.1
+
+@Subdir third_party/guava
+chromium/third_party/guava version:20.0
+
+@Subdir third_party/hamcrest
+chromium/third_party/hamcrest version:1.3
+
+@Subdir third_party/icu4j
+chromium/third_party/icu4j version:53.1
+
+@Subdir third_party/intellij
+chromium/third_party/intellij version:12.0
+
+@Subdir third_party/javax_inject
+chromium/third_party/javax_inject version:1
+
+@Subdir third_party/objenesis
+chromium/third_party/objenesis version:2.4
+
+@Subdir third_party/ow2_asm
+chromium/third_party/ow2_asm version:5.0.1
+
+@Subdir third_party/robolectric
+chromium/third_party/robolectric version:3.2
+
+@Subdir third_party/sqlite4java
+chromium/third_party/sqlite4java version:0.282
+
+@Subdir third_party/xstream
+chromium/third_party/xstream version:1.4.8
+
diff --git a/build/cipd/cipd_wrapper.py b/build/cipd/cipd_wrapper.py
new file mode 100755
index 00000000000000..b1c256079cfc41
--- /dev/null
+++ b/build/cipd/cipd_wrapper.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+#
+# Copyright 2017 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 argparse
+import os
+import subprocess
+import sys
+
+ENSURE_FILEPATH = {
+  'android': os.path.join(
+      os.path.dirname(__file__), 'android', 'android.ensure')
+}
+
+
+def cipd_ensure(root, service_url, target_os):
+
+  def is_windows():
+    return sys.platform in ('cygwin', 'win32')
+
+  ensure_file = ENSURE_FILEPATH[target_os]
+
+  cipd_binary = 'cipd'
+  if is_windows():
+    cipd_binary = 'cipd.bat'
+
+  return subprocess.call(
+      [cipd_binary, 'ensure',
+       '-ensure-file', ensure_file,
+       '-root', root,
+       '-service-url', service_url],
+      shell=is_windows())
+
+
+def main():
+  parser = argparse.ArgumentParser()
+
+  parser.add_argument(
+      '--chromium-root',
+      required=True,
+      help='Root directory for dependency.')
+  parser.add_argument(
+      '--service-url',
+      help='The url of the CIPD service.',
+      default='https://chrome-infra-packages.appspot.com')
+  parser.add_argument(
+      '--target-os',
+      required=True,
+      help='Target OS for build.')
+  args = parser.parse_args()
+  cipd_ensure(args.chromium_root, args.service_url, args.target_os)
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index b8d0119f8d8322..1bc54fb95372b2 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -409,6 +409,9 @@ template("copy_ex") {
     outputs = [
       _stamp_file,
     ]
+    if (defined(invoker.outputs)) {
+      outputs += invoker.outputs
+    }
 
     args = [
       "--depfile",
@@ -1308,7 +1311,7 @@ if (enable_java_templates) {
     }
 
     _output_jar_target = "${target_name}__copy"
-    copy(_output_jar_target) {
+    copy_ex(_output_jar_target) {
       deps = _deps
       if (defined(invoker.deps)) {
         deps += invoker.deps
@@ -1316,6 +1319,7 @@ if (enable_java_templates) {
       if (defined(invoker.public_deps)) {
         public_deps = invoker.public_deps
       }
+      dest = _output_jar_path
       sources = [
         _previous_output_jar,
       ]
diff --git a/third_party/.gitignore b/third_party/.gitignore
index 94db06738e3254..f55d59ef2f90f0 100644
--- a/third_party/.gitignore
+++ b/third_party/.gitignore
@@ -16,7 +16,6 @@
 /angle
 /angle_dx11
 /apache-portable-runtime/src
-/apache_velocity/lib/*.jar
 /apache-win32/bin/*.exe
 /apache-win32/bin/*.dll
 /apache-win32/bin/iconv/*.so
diff --git a/third_party/accessibility_test_framework/cipd.yaml b/third_party/accessibility_test_framework/cipd.yaml
new file mode 100644
index 00000000000000..8ad908ba9e0568
--- /dev/null
+++ b/third_party/accessibility_test_framework/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/accessibility-test-framework
+description: accessibility-test-framework Java library
+data:
+  - file: lib/accessibility-test-framework-2.1.jar
\ No newline at end of file
diff --git a/third_party/accessibility_test_framework/lib/accessibility-test-framework-2.1.jar.sha1 b/third_party/accessibility_test_framework/lib/accessibility-test-framework-2.1.jar.sha1
deleted file mode 100644
index 0ccad213b5ddfa..00000000000000
--- a/third_party/accessibility_test_framework/lib/accessibility-test-framework-2.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c2d6267c3ad0435ddf9e27a94a0e0af4ca3fdfbb
\ No newline at end of file
diff --git a/third_party/accessibility_test_framework/version.txt b/third_party/accessibility_test_framework/version.txt
new file mode 100644
index 00000000000000..879b416e609a82
--- /dev/null
+++ b/third_party/accessibility_test_framework/version.txt
@@ -0,0 +1 @@
+2.1
diff --git a/third_party/android_support_test_runner/cipd.yaml b/third_party/android_support_test_runner/cipd.yaml
new file mode 100644
index 00000000000000..06e5ba9780d930
--- /dev/null
+++ b/third_party/android_support_test_runner/cipd.yaml
@@ -0,0 +1,12 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/android_support_test_runner
+description: android_support_test_runner Java libraries
+data:
+  - file: lib/exposed-instrumentation-api-publish-0.5-no-dep.jar
+  - file: lib/rules-0.5.aar
+  - file: lib/runner-0.5-release-no-dep.jar
diff --git a/third_party/android_support_test_runner/lib/exposed-instrumentation-api-publish-0.5-no-dep.jar.sha1 b/third_party/android_support_test_runner/lib/exposed-instrumentation-api-publish-0.5-no-dep.jar.sha1
deleted file mode 100644
index b5c46d07e00357..00000000000000
--- a/third_party/android_support_test_runner/lib/exposed-instrumentation-api-publish-0.5-no-dep.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-905f3e63973d47fedf2d945fa31d8c0f0c98816e
\ No newline at end of file
diff --git a/third_party/android_support_test_runner/lib/rules-0.5.aar.sha1 b/third_party/android_support_test_runner/lib/rules-0.5.aar.sha1
deleted file mode 100644
index eb0422b7cec193..00000000000000
--- a/third_party/android_support_test_runner/lib/rules-0.5.aar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f62d39eb9fede7f037699965d10188d992e835f6
\ No newline at end of file
diff --git a/third_party/android_support_test_runner/lib/runner-0.5-release-no-dep.jar.sha1 b/third_party/android_support_test_runner/lib/runner-0.5-release-no-dep.jar.sha1
deleted file mode 100644
index a2e8bec65b1749..00000000000000
--- a/third_party/android_support_test_runner/lib/runner-0.5-release-no-dep.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-796f9229948e907471c5595fbe94655ccf03ff73
\ No newline at end of file
diff --git a/third_party/android_support_test_runner/version.txt b/third_party/android_support_test_runner/version.txt
new file mode 100644
index 00000000000000..2eb3c4fe4eebcd
--- /dev/null
+++ b/third_party/android_support_test_runner/version.txt
@@ -0,0 +1 @@
+0.5
diff --git a/third_party/android_system_sdk/android-stubs-src.jar.sha1 b/third_party/android_system_sdk/android-stubs-src.jar.sha1
deleted file mode 100644
index e2920c24d00e3f..00000000000000
--- a/third_party/android_system_sdk/android-stubs-src.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2d660356a1473c93a0b8e08406a8ebb3722d8a20
diff --git a/third_party/android_system_sdk/android_system.jar.sha1 b/third_party/android_system_sdk/android_system.jar.sha1
deleted file mode 100644
index 6a1ea22cfe4cc4..00000000000000
--- a/third_party/android_system_sdk/android_system.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7ddf6745918ea48bc4bdb7c6802ee2bcebacd462
diff --git a/third_party/android_system_sdk/cipd.yaml b/third_party/android_system_sdk/cipd.yaml
new file mode 100644
index 00000000000000..f3bd9f5cbdc16e
--- /dev/null
+++ b/third_party/android_system_sdk/cipd.yaml
@@ -0,0 +1,11 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/android_system_sdk
+description: System SDK stubs for compile WebView and Monochrome targets
+data:
+  - file: android-stubs-src.jar
+  - file: android_system.jar 
diff --git a/third_party/android_system_sdk/version.txt b/third_party/android_system_sdk/version.txt
new file mode 100644
index 00000000000000..573541ac9702dd
--- /dev/null
+++ b/third_party/android_system_sdk/version.txt
@@ -0,0 +1 @@
+0
diff --git a/third_party/apache_velocity/BUILD.gn b/third_party/apache_velocity/BUILD.gn
deleted file mode 100644
index 15d84cecd3e315..00000000000000
--- a/third_party/apache_velocity/BUILD.gn
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2016 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/rules.gni")
-
-java_prebuilt("apache_velocity_java") {
-  testonly = true
-  jar_path = "lib/velocity-1.7-dep.jar"
-}
diff --git a/third_party/apache_velocity/LICENSE b/third_party/apache_velocity/LICENSE
deleted file mode 100644
index 25b736eef88cb0..00000000000000
--- a/third_party/apache_velocity/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                             Apache License
-                       Version 2.0, January 2004
-                    http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/third_party/apache_velocity/OWNERS b/third_party/apache_velocity/OWNERS
deleted file mode 100644
index 7fcd92bbbd6664..00000000000000
--- a/third_party/apache_velocity/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-jbudorick@chromium.org
-mikecase@chromium.org
-yolandyan@chromium.org
\ No newline at end of file
diff --git a/third_party/apache_velocity/README.chromium b/third_party/apache_velocity/README.chromium
deleted file mode 100644
index ed92ad1c6fc0b9..00000000000000
--- a/third_party/apache_velocity/README.chromium
+++ /dev/null
@@ -1,8 +0,0 @@
-Name: Apache Velocity
-URL: http://velocity.apache.org/
-Version: 1.7
-License: Apache 2.0
-License File: NOT_SHIPPED
-Security Critical: no
-Description: Apache Velocity is a Java-based template engine.
-Local Modifications: None
\ No newline at end of file
diff --git a/third_party/apache_velocity/lib/velocity-1.7-dep.jar.sha1 b/third_party/apache_velocity/lib/velocity-1.7-dep.jar.sha1
deleted file mode 100644
index 428725bb6ba160..00000000000000
--- a/third_party/apache_velocity/lib/velocity-1.7-dep.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d7d06a40e8e266d62d6d9add29d1b5b9d067ee5c
diff --git a/third_party/apk-patch-size-estimator/cipd.yaml b/third_party/apk-patch-size-estimator/cipd.yaml
new file mode 100644
index 00000000000000..2c6df0dee8b91a
--- /dev/null
+++ b/third_party/apk-patch-size-estimator/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/apk-patch-size-estimator
+description: apk-patch-size-estimator Java library
+data:
+  - file: lib/file-by-file-tools.jar
\ No newline at end of file
diff --git a/third_party/apk-patch-size-estimator/lib/file-by-file-tools.jar.sha1 b/third_party/apk-patch-size-estimator/lib/file-by-file-tools.jar.sha1
deleted file mode 100644
index 0f0c0c664a72a0..00000000000000
--- a/third_party/apk-patch-size-estimator/lib/file-by-file-tools.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25782572194dcc1ae3240629824f80e545bc45f7
\ No newline at end of file
diff --git a/third_party/apk-patch-size-estimator/version.txt b/third_party/apk-patch-size-estimator/version.txt
new file mode 100644
index 00000000000000..3b04cfb60da13a
--- /dev/null
+++ b/third_party/apk-patch-size-estimator/version.txt
@@ -0,0 +1 @@
+0.2
diff --git a/third_party/bazel/cipd.yaml b/third_party/bazel/cipd.yaml
new file mode 100644
index 00000000000000..1e1f2eb7a47920
--- /dev/null
+++ b/third_party/bazel/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/bazel
+description: Java library to transform Java 8 bytecode to Java 7 
+data:
+  - file: desugar/Desugar.jar 
diff --git a/third_party/bazel/desugar/Desugar.jar.sha1 b/third_party/bazel/desugar/Desugar.jar.sha1
deleted file mode 100644
index 28cb87afd9f5d4..00000000000000
--- a/third_party/bazel/desugar/Desugar.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-049b5e43576b0601659dddd0deee7e3f97e78646
\ No newline at end of file
diff --git a/third_party/bazel/version.txt b/third_party/bazel/version.txt
new file mode 100644
index 00000000000000..573541ac9702dd
--- /dev/null
+++ b/third_party/bazel/version.txt
@@ -0,0 +1 @@
+0
diff --git a/third_party/bouncycastle/cipd.yaml b/third_party/bouncycastle/cipd.yaml
new file mode 100644
index 00000000000000..d9010d48d48618
--- /dev/null
+++ b/third_party/bouncycastle/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/bouncycastle
+description: bouncycastle Java library
+data:
+  - file: lib/bcprov-jdk16-1.46.jar
\ No newline at end of file
diff --git a/third_party/bouncycastle/lib/bcprov-jdk16-1.46.jar.sha1 b/third_party/bouncycastle/lib/bcprov-jdk16-1.46.jar.sha1
deleted file mode 100644
index 4f126df06bc5fa..00000000000000
--- a/third_party/bouncycastle/lib/bcprov-jdk16-1.46.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ce091790943599535cbb4de8ede84535b0c1260c
diff --git a/third_party/bouncycastle/version.txt b/third_party/bouncycastle/version.txt
new file mode 100644
index 00000000000000..7ab887e291b63d
--- /dev/null
+++ b/third_party/bouncycastle/version.txt
@@ -0,0 +1 @@
+1.46
diff --git a/third_party/byte_buddy/cipd.yaml b/third_party/byte_buddy/cipd.yaml
new file mode 100644
index 00000000000000..9346c4d790bdc3
--- /dev/null
+++ b/third_party/byte_buddy/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/byte_buddy
+description: byte_buddy Java library
+data:
+  - file: lib/byte-buddy-1.4.17.jar
\ No newline at end of file
diff --git a/third_party/byte_buddy/lib/byte-buddy-1.4.17.jar.sha1 b/third_party/byte_buddy/lib/byte-buddy-1.4.17.jar.sha1
deleted file mode 100644
index 40b602c7b0c431..00000000000000
--- a/third_party/byte_buddy/lib/byte-buddy-1.4.17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-466b516b8a98e2d6dcf340362029b9f02800b6b6
\ No newline at end of file
diff --git a/third_party/byte_buddy/version.txt b/third_party/byte_buddy/version.txt
new file mode 100644
index 00000000000000..04e0d3f14fd006
--- /dev/null
+++ b/third_party/byte_buddy/version.txt
@@ -0,0 +1 @@
+1.4.17
diff --git a/third_party/espresso/cipd.yaml b/third_party/espresso/cipd.yaml
new file mode 100644
index 00000000000000..7a359231b17873
--- /dev/null
+++ b/third_party/espresso/cipd.yaml
@@ -0,0 +1,14 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/espresso
+description: espresso Java library
+data:
+  - file: lib/espresso-contrib-2.2.1-release-no-dep.jar
+  - file: lib/espresso-core-2.2.1-release-no-dep.jar
+  - file: lib/espresso-idling-resource-2.2.1-release-no-dep.jar
+  - file: lib/espresso-intents-2.2.1-release-no-dep.jar
+  - file: lib/espresso-web-2.2.1-release-no-dep.jar
\ No newline at end of file
diff --git a/third_party/espresso/lib/espresso-contrib-2.2.1-release-no-dep.jar.sha1 b/third_party/espresso/lib/espresso-contrib-2.2.1-release-no-dep.jar.sha1
deleted file mode 100644
index 1f523df115e6a2..00000000000000
--- a/third_party/espresso/lib/espresso-contrib-2.2.1-release-no-dep.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-72cf04ecaab0bb92a6a18b0264e0684aa3d1881b
\ No newline at end of file
diff --git a/third_party/espresso/lib/espresso-core-2.2.1-release-no-dep.jar.sha1 b/third_party/espresso/lib/espresso-core-2.2.1-release-no-dep.jar.sha1
deleted file mode 100644
index 201772ba48e154..00000000000000
--- a/third_party/espresso/lib/espresso-core-2.2.1-release-no-dep.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06ea68f7818866197247aebb1aa87db2101678ed
\ No newline at end of file
diff --git a/third_party/espresso/lib/espresso-idling-resource-2.2.1-release-no-dep.jar.sha1 b/third_party/espresso/lib/espresso-idling-resource-2.2.1-release-no-dep.jar.sha1
deleted file mode 100644
index c78578daeef267..00000000000000
--- a/third_party/espresso/lib/espresso-idling-resource-2.2.1-release-no-dep.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-600daa034b62e193487208e28bde17cd3de06525
\ No newline at end of file
diff --git a/third_party/espresso/lib/espresso-intents-2.2.1-release-no-dep.jar.sha1 b/third_party/espresso/lib/espresso-intents-2.2.1-release-no-dep.jar.sha1
deleted file mode 100644
index 1cff4990f704fd..00000000000000
--- a/third_party/espresso/lib/espresso-intents-2.2.1-release-no-dep.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24a6808324bba17ae852fe68dea927b0219da19e
\ No newline at end of file
diff --git a/third_party/espresso/lib/espresso-web-2.2.1-release-no-dep.jar.sha1 b/third_party/espresso/lib/espresso-web-2.2.1-release-no-dep.jar.sha1
deleted file mode 100644
index 2b9fddc75ae0e0..00000000000000
--- a/third_party/espresso/lib/espresso-web-2.2.1-release-no-dep.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b4c1ae773ef917a9421a3d616dbd632478aa63b8
\ No newline at end of file
diff --git a/third_party/espresso/version.txt b/third_party/espresso/version.txt
new file mode 100644
index 00000000000000..c043eea7767eec
--- /dev/null
+++ b/third_party/espresso/version.txt
@@ -0,0 +1 @@
+2.2.1
diff --git a/third_party/guava/cipd.yaml b/third_party/guava/cipd.yaml
new file mode 100644
index 00000000000000..1c1c3479850f5e
--- /dev/null
+++ b/third_party/guava/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/guava
+description: guava Java library
+data:
+  - file: lib/guava-20.0.jar
\ No newline at end of file
diff --git a/third_party/guava/lib/guava-20.0.jar.sha1 b/third_party/guava/lib/guava-20.0.jar.sha1
deleted file mode 100644
index 7b6ae09060b29b..00000000000000
--- a/third_party/guava/lib/guava-20.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-89507701249388e1ed5ddcf8c41f4ce1be7831ef
\ No newline at end of file
diff --git a/third_party/guava/version.txt b/third_party/guava/version.txt
new file mode 100644
index 00000000000000..9a7c1e503f7fee
--- /dev/null
+++ b/third_party/guava/version.txt
@@ -0,0 +1 @@
+20.0
diff --git a/third_party/hamcrest/cipd.yaml b/third_party/hamcrest/cipd.yaml
new file mode 100644
index 00000000000000..5664be8c27a715
--- /dev/null
+++ b/third_party/hamcrest/cipd.yaml
@@ -0,0 +1,12 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/hamcrest
+description: hamcrest Java library
+data:
+  - file: lib/hamcrest-core-1.3.jar
+  - file: lib/hamcrest-integration-1.3.jar
+  - file: lib/hamcrest-library-1.3.jar
\ No newline at end of file
diff --git a/third_party/hamcrest/lib/hamcrest-core-1.3.jar.sha1 b/third_party/hamcrest/lib/hamcrest-core-1.3.jar.sha1
deleted file mode 100644
index 0881850668d542..00000000000000
--- a/third_party/hamcrest/lib/hamcrest-core-1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-859db73d92c486964e00ee4a62108312112933e2
\ No newline at end of file
diff --git a/third_party/hamcrest/lib/hamcrest-integration-1.3.jar.sha1 b/third_party/hamcrest/lib/hamcrest-integration-1.3.jar.sha1
deleted file mode 100644
index c40312801cd6a3..00000000000000
--- a/third_party/hamcrest/lib/hamcrest-integration-1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-65460ac48fa7bdd1fb15b71b87ccc012b28a9a08
\ No newline at end of file
diff --git a/third_party/hamcrest/lib/hamcrest-library-1.3.jar.sha1 b/third_party/hamcrest/lib/hamcrest-library-1.3.jar.sha1
deleted file mode 100644
index 9d6dc9eefe4b2d..00000000000000
--- a/third_party/hamcrest/lib/hamcrest-library-1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6ccbe0b4605d06b48576646e5de038ef24eb833
\ No newline at end of file
diff --git a/third_party/hamcrest/version.txt b/third_party/hamcrest/version.txt
new file mode 100644
index 00000000000000..7e32cd56983e65
--- /dev/null
+++ b/third_party/hamcrest/version.txt
@@ -0,0 +1 @@
+1.3
diff --git a/third_party/icu4j/cipd.yaml b/third_party/icu4j/cipd.yaml
new file mode 100644
index 00000000000000..23b950d4fe341b
--- /dev/null
+++ b/third_party/icu4j/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/icu4j
+description: icu4j Java library
+data:
+  - file: lib/icu4j-53.1.jar
\ No newline at end of file
diff --git a/third_party/icu4j/lib/icu4j-53.1.jar.sha1 b/third_party/icu4j/lib/icu4j-53.1.jar.sha1
deleted file mode 100644
index ac60dac2311875..00000000000000
--- a/third_party/icu4j/lib/icu4j-53.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-786d9055d4ca8c1aab4a7d4ac8283f973fd7e41f
diff --git a/third_party/icu4j/version.txt b/third_party/icu4j/version.txt
new file mode 100644
index 00000000000000..6c45d84c30e6c5
--- /dev/null
+++ b/third_party/icu4j/version.txt
@@ -0,0 +1 @@
+53.1
diff --git a/third_party/intellij/cipd.yaml b/third_party/intellij/cipd.yaml
new file mode 100644
index 00000000000000..0a0056757bbdf4
--- /dev/null
+++ b/third_party/intellij/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/intellij
+description: intellij Java library
+data:
+  - file: lib/annotations-12.0.jar
\ No newline at end of file
diff --git a/third_party/intellij/lib/annotations-12.0.jar.sha1 b/third_party/intellij/lib/annotations-12.0.jar.sha1
deleted file mode 100644
index 8e8618350b1f86..00000000000000
--- a/third_party/intellij/lib/annotations-12.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbcf6448f6d40abe506e2c83b70a3e8bfd2b4539
diff --git a/third_party/intellij/version.txt b/third_party/intellij/version.txt
new file mode 100644
index 00000000000000..d7213f31f78a21
--- /dev/null
+++ b/third_party/intellij/version.txt
@@ -0,0 +1 @@
+12.0
diff --git a/third_party/javax_inject/cipd.yaml b/third_party/javax_inject/cipd.yaml
new file mode 100644
index 00000000000000..6a8849ef99374c
--- /dev/null
+++ b/third_party/javax_inject/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/javax_inject
+description: javax_inject Java library
+data:
+  - file: lib/javax.inject-1.jar
\ No newline at end of file
diff --git a/third_party/javax_inject/lib/javax.inject-1.jar.sha1 b/third_party/javax_inject/lib/javax.inject-1.jar.sha1
deleted file mode 100644
index c2fa85f1e9bca1..00000000000000
--- a/third_party/javax_inject/lib/javax.inject-1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6975da39a7040257bd51d21a231b76c915872d38
\ No newline at end of file
diff --git a/third_party/javax_inject/version.txt b/third_party/javax_inject/version.txt
new file mode 100644
index 00000000000000..d00491fd7e5bb6
--- /dev/null
+++ b/third_party/javax_inject/version.txt
@@ -0,0 +1 @@
+1
diff --git a/third_party/objenesis/cipd.yaml b/third_party/objenesis/cipd.yaml
new file mode 100644
index 00000000000000..de3ed43a6300b5
--- /dev/null
+++ b/third_party/objenesis/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/objenesis
+description: objenesis Java library
+data:
+  - file: lib/objenesis-2.4.jar
\ No newline at end of file
diff --git a/third_party/objenesis/lib/objenesis-2.4.jar.sha1 b/third_party/objenesis/lib/objenesis-2.4.jar.sha1
deleted file mode 100644
index c44530137d9c07..00000000000000
--- a/third_party/objenesis/lib/objenesis-2.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af258f7e904e6683038e98d0dbab7822e503c0f2
\ No newline at end of file
diff --git a/third_party/objenesis/version.txt b/third_party/objenesis/version.txt
new file mode 100644
index 00000000000000..6b4950e3de2f6c
--- /dev/null
+++ b/third_party/objenesis/version.txt
@@ -0,0 +1 @@
+2.4
diff --git a/third_party/ow2_asm/cipd.yaml b/third_party/ow2_asm/cipd.yaml
new file mode 100644
index 00000000000000..e80dc3f34a3e54
--- /dev/null
+++ b/third_party/ow2_asm/cipd.yaml
@@ -0,0 +1,14 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/ow2_asm
+description: ow2_asm Java library
+data:
+  - file: lib/asm-5.0.1.jar
+  - file: lib/asm-analysis-5.0.1.jar
+  - file: lib/asm-commons-5.0.1.jar
+  - file: lib/asm-tree-5.0.1.jar
+  - file: lib/asm-util-5.0.1.jar
\ No newline at end of file
diff --git a/third_party/ow2_asm/lib/asm-5.0.1.jar.sha1 b/third_party/ow2_asm/lib/asm-5.0.1.jar.sha1
deleted file mode 100644
index a0f7ebf8afeec1..00000000000000
--- a/third_party/ow2_asm/lib/asm-5.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2fd56467a018aafe6ec6a73ccba520be4a7e1565
diff --git a/third_party/ow2_asm/lib/asm-analysis-5.0.1.jar.sha1 b/third_party/ow2_asm/lib/asm-analysis-5.0.1.jar.sha1
deleted file mode 100644
index b1cdbb7595c503..00000000000000
--- a/third_party/ow2_asm/lib/asm-analysis-5.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e286fbee48efacb4e7c175f7948d9d8b2ab52352
diff --git a/third_party/ow2_asm/lib/asm-commons-5.0.1.jar.sha1 b/third_party/ow2_asm/lib/asm-commons-5.0.1.jar.sha1
deleted file mode 100644
index b9f49cdfdd2348..00000000000000
--- a/third_party/ow2_asm/lib/asm-commons-5.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b7147a390a93a14d2edfdcf3f7b0e87a0939c3e
diff --git a/third_party/ow2_asm/lib/asm-tree-5.0.1.jar.sha1 b/third_party/ow2_asm/lib/asm-tree-5.0.1.jar.sha1
deleted file mode 100644
index f38065e992b3b2..00000000000000
--- a/third_party/ow2_asm/lib/asm-tree-5.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1b1e6e9d869acd704056d0a4223071a511c619e6
diff --git a/third_party/ow2_asm/lib/asm-util-5.0.1.jar.sha1 b/third_party/ow2_asm/lib/asm-util-5.0.1.jar.sha1
deleted file mode 100644
index 0c0cbe74b2ac86..00000000000000
--- a/third_party/ow2_asm/lib/asm-util-5.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7c8caddfbd0b2d7b844f8fcc75175b9cb9cf4724
diff --git a/third_party/ow2_asm/version.txt b/third_party/ow2_asm/version.txt
new file mode 100644
index 00000000000000..6b244dcd6960b1
--- /dev/null
+++ b/third_party/ow2_asm/version.txt
@@ -0,0 +1 @@
+5.0.1
diff --git a/third_party/robolectric/README.chromium b/third_party/robolectric/README.chromium
index f1c8c59baa536c..4e7c3e5e91bdf5 100644
--- a/third_party/robolectric/README.chromium
+++ b/third_party/robolectric/README.chromium
@@ -1,6 +1,6 @@
 Name: Robolectric 
 URL: http://robolectric.org
-Version: 3.0
+Version: 3.2
 License: Apache 2.0 
 License File: NOT_SHIPPED
 Security Critical: no
diff --git a/third_party/robolectric/cipd.yaml b/third_party/robolectric/cipd.yaml
new file mode 100644
index 00000000000000..13c5094ea5635e
--- /dev/null
+++ b/third_party/robolectric/cipd.yaml
@@ -0,0 +1,12 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/robolectric
+description: robolectric modified Android SDKs
+data:
+  - file: lib/android-all-4.3_r2-robolectric-0.jar
+  - file: lib/android-all-5.0.0_r2-robolectric-1.jar
+  - file: lib/android-all-7.1.0_r7-robolectric-0.jar
\ No newline at end of file
diff --git a/third_party/robolectric/lib/android-all-4.3_r2-robolectric-0.jar.sha1 b/third_party/robolectric/lib/android-all-4.3_r2-robolectric-0.jar.sha1
deleted file mode 100644
index 11ead144a89661..00000000000000
--- a/third_party/robolectric/lib/android-all-4.3_r2-robolectric-0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1231c61c42da2b1db9cbe13e449251f0db318e46
\ No newline at end of file
diff --git a/third_party/robolectric/lib/android-all-5.0.0_r2-robolectric-1.jar.sha1 b/third_party/robolectric/lib/android-all-5.0.0_r2-robolectric-1.jar.sha1
deleted file mode 100644
index bbffefc16486c0..00000000000000
--- a/third_party/robolectric/lib/android-all-5.0.0_r2-robolectric-1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7c63cd7aeb55d63e3e208b77882831c7ac588ed8
\ No newline at end of file
diff --git a/third_party/robolectric/lib/android-all-7.1.0_r7-robolectric-0.jar.sha1 b/third_party/robolectric/lib/android-all-7.1.0_r7-robolectric-0.jar.sha1
deleted file mode 100644
index cb2d17511940b9..00000000000000
--- a/third_party/robolectric/lib/android-all-7.1.0_r7-robolectric-0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c6478c2c63230d9480023ea5d90180c1e4f3b893
\ No newline at end of file
diff --git a/third_party/robolectric/version.txt b/third_party/robolectric/version.txt
new file mode 100644
index 00000000000000..a3ec5a4bd3d720
--- /dev/null
+++ b/third_party/robolectric/version.txt
@@ -0,0 +1 @@
+3.2
diff --git a/third_party/sqlite4java/cipd.yaml b/third_party/sqlite4java/cipd.yaml
new file mode 100644
index 00000000000000..2241f7e8604e70
--- /dev/null
+++ b/third_party/sqlite4java/cipd.yaml
@@ -0,0 +1,15 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/sqlite4java
+description: sqlite4java Java library
+data:
+  - file: lib/sqlite4java-0.282.jar
+  - file: lib/linux-x86/libsqlite4java.so
+  - file: lib/linux-x86_64/libsqlite4java.so
+  - file: lib/mac-x86_64/libsqlite4java.jnilib
+  - file: lib/windows-x86/sqlite4java.dll
+  - file: lib/windows-x86_64/sqlite4java.dll
diff --git a/third_party/sqlite4java/lib/linux-x86/libsqlite4java.so.sha1 b/third_party/sqlite4java/lib/linux-x86/libsqlite4java.so.sha1
deleted file mode 100644
index 4dd98457b5699c..00000000000000
--- a/third_party/sqlite4java/lib/linux-x86/libsqlite4java.so.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5a9a3d43f5913b0783eb994513df2af02a58a700
diff --git a/third_party/sqlite4java/lib/linux-x86_64/libsqlite4java.so.sha1 b/third_party/sqlite4java/lib/linux-x86_64/libsqlite4java.so.sha1
deleted file mode 100644
index 0a93f6d868098e..00000000000000
--- a/third_party/sqlite4java/lib/linux-x86_64/libsqlite4java.so.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1617bcfd2c6c20f511152bffc6a595a1d0eedbc0
diff --git a/third_party/sqlite4java/lib/mac-x86_64/libsqlite4java.jnilib.sha1 b/third_party/sqlite4java/lib/mac-x86_64/libsqlite4java.jnilib.sha1
deleted file mode 100644
index aedc7cd9dc2efe..00000000000000
--- a/third_party/sqlite4java/lib/mac-x86_64/libsqlite4java.jnilib.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e18dabd7fe70e37771457a63162fe6f028628ac9
diff --git a/third_party/sqlite4java/lib/sqlite4java-0.282.jar.sha1 b/third_party/sqlite4java/lib/sqlite4java-0.282.jar.sha1
deleted file mode 100644
index 9a6a5ffdea3f3c..00000000000000
--- a/third_party/sqlite4java/lib/sqlite4java-0.282.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-745a7e2f35fdbe6336922e0d492c979dbbfa74fb
diff --git a/third_party/sqlite4java/lib/windows-x86/sqlite4java.dll.sha1 b/third_party/sqlite4java/lib/windows-x86/sqlite4java.dll.sha1
deleted file mode 100644
index 695e034de128d9..00000000000000
--- a/third_party/sqlite4java/lib/windows-x86/sqlite4java.dll.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea73fbc9344471a4489792ebd669c9c543ec9844
diff --git a/third_party/sqlite4java/lib/windows-x86_64/sqlite4java.dll.sha1 b/third_party/sqlite4java/lib/windows-x86_64/sqlite4java.dll.sha1
deleted file mode 100644
index 25668e15a49edb..00000000000000
--- a/third_party/sqlite4java/lib/windows-x86_64/sqlite4java.dll.sha1
+++ /dev/null
@@ -1 +0,0 @@
-78215ca7b1c87b4f7be3b7da5086009c3c95fac6
diff --git a/third_party/sqlite4java/version.txt b/third_party/sqlite4java/version.txt
new file mode 100644
index 00000000000000..557421a6736fef
--- /dev/null
+++ b/third_party/sqlite4java/version.txt
@@ -0,0 +1 @@
+0.282
diff --git a/third_party/xstream/cipd.yaml b/third_party/xstream/cipd.yaml
new file mode 100644
index 00000000000000..b766d66e549779
--- /dev/null
+++ b/third_party/xstream/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+package: chromium/third_party/xstream
+description: xstream Java library
+data:
+  - file: lib/xstream-1.4.8.jar
\ No newline at end of file
diff --git a/third_party/xstream/lib/xstream-1.4.8.jar.sha1 b/third_party/xstream/lib/xstream-1.4.8.jar.sha1
deleted file mode 100644
index e836802b0bba03..00000000000000
--- a/third_party/xstream/lib/xstream-1.4.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-520d90f30f36a0d6ba2dc929d980831631ad6a92
\ No newline at end of file
diff --git a/third_party/xstream/version.txt b/third_party/xstream/version.txt
new file mode 100644
index 00000000000000..b2e46d1851c86e
--- /dev/null
+++ b/third_party/xstream/version.txt
@@ -0,0 +1 @@
+1.4.8