Update roll script to allow advanced url specs, update catapult repo.

Bug: libyuv:768
Test: git checkout master && tools_libyuv/autoroller/roll_deps.py

Change-Id: I55f21382cb947ecff2078eb9a0fa5572ceee64b5
Reviewed-on: https://chromium-review.googlesource.com/847001
Commit-Queue: Frank Barchard <fbarchard@chromium.org>
Reviewed-by: Frank Barchard <fbarchard@chromium.org>

DEPS

@@ -22,7 +22,7 @@ deps = {
   'src/third_party':
     Var('chromium_git') + '/chromium/src/third_party' + '@' + '72c52c224cdd3c377f7caff8ffed0f5749e79549',
   'src/third_party/catapult':
-   Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + Var('catapult_revision'),
+    Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
   'src/third_party/colorama/src':
     Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
   'src/third_party/googletest/src':

tools_libyuv/autoroller/roll_deps.py

@@ -207,7 +207,13 @@ def BuildDepsentryDict(deps_dict):
   """Builds a dict of paths to DepsEntry objects from a raw parsed deps dict."""
   result = {}
   def AddDepsEntries(deps_subdict):
-    for path, deps_url in deps_subdict.iteritems():
+    for path, deps_url_spec in deps_subdict.iteritems():
+      # The deps url is either an URL and a condition, or just the URL.
+      if isinstance(deps_url_spec, dict):
+        deps_url = deps_url_spec['url']
+      else:
+        deps_url = deps_url_spec
+
       if not result.has_key(path):
         url, revision = deps_url.split('@') if deps_url else (None, None)
         result[path] = DepsEntry(path, url, revision)