[WIP] Adding Mockito support in Android instrumentation tests

DEPS

 # This file is used to manage the dependencies of the Chromium src repo. It is
 # used by gclient to determine what version of each dependency to check out, and
 # where.
 #
 # For more information, please refer to the official documentation:
 #   https://sites.google.com/a/chromium.org/dev/developers/how-tos/get-the-code
 #
 # When adding a new dependency, please update the top-level .gitignore file
 # to list the dependency's destination directory.
 #
@@ skipping 471 matching lines @@
 
     'src/third_party/elfutils/src':
       Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
 
     'src/third_party/jsr-305/src':
       Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
 
     'src/third_party/junit/src':
       Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481',
 
-    'src/third_party/mockito/src':
-      Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850',
-
     'src/third_party/netty-tcnative/src':
       Var('chromium_git') + '/external/netty-tcnative.git' + '@' + '2e0f9503f3d4efe6fc3f70077f22471e83ffb446',
 
     'src/third_party/netty4/src':
       Var('chromium_git') + '/external/netty4.git' + '@' + 'e0f26303b4ce635365be19414d0ac81f2ef6ba3c',
 
     'src/third_party/robolectric/robolectric':
       Var('chromium_git') + '/external/robolectric.git' + '@' + '2a0b6ba221c14f3371813a676ce06143353e448d',
 
     'src/third_party/ub-uiautomator/lib':
@@ skipping 279 matching lines @@
     'name': 'xstream',
     'pattern': '.',
     'action': ['python',
                'src/build/android/update_deps/update_third_party_deps.py',
                'download',
                '-b', 'chromium-robolectric',
                '-l', 'third_party/xstream'
     ],
   },
   {
+    'name': 'mockito',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-android-tools/mockito',
+               '-l', 'third_party/mockito'
+    ],
+  },
+  {
+    'name': 'android_dalvik_dx',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-android-tools/android_dalvik_dx',
+               '-l', 'third_party/android_dalvik_dx'
+    ],
+  },
+  {
+    'name': 'android_libcore_dex',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-android-tools/android_libcore_dex',
+               '-l', 'third_party/android_libcore_dex'
+    ],
+  },
+  {
     # Downloads the current stable linux sysroot to build/linux/ if needed.
     # This sysroot updates at about the same rate that the chrome build deps
     # change. This script is a no-op except for linux users who are doing
     # official chrome builds or cross compiling.
     'name': 'sysroot',
     'pattern': '.',
     'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
                '--running-as-hook'],
   },
   {
@@ skipping 343 matching lines @@
 recursedeps = [
   # buildtools provides clang_format, libc++, and libc++abi
   'src/buildtools',
   # android_tools manages the NDK.
   'src/third_party/android_tools',
   # ANGLE manages DEPS that it also owns the build files for, such as dEQP.
   ("src/third_party/angle", "DEPS.chromium"),
   # SwiftShader manages DEPS that it also owns the build files for, such as Subzero.
   ("src/third_party/swiftshader", "DEPS"),
 ]