Roll recipe dependencies (nontrivial).

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM+CQ.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
  https://crrev.com/060325b14d5a63ce65e65d93052b265ee310a828 [path] Cleanup and use "C:\" for test Windows base (dnj@chromium.org)
  https://crrev.com/96221bce29d908b951812550036f42520f085dec [generator_script] Make allowed keys strict and improve error handling. (iannucci@chromium.org)
  https://crrev.com/cfff93afa16e61285e295d49f6aa2ba64642f330 [path] bring PLATFORM back to config. (iannucci@chromium.org)


R=martiniss@chromium.org, phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I214f2a5a0f39b09d7c401da8f997545336335bbb
Reviewed-on: https://chromium-review.googlesource.com/531974
Commit-Queue: Recipe Roller <recipe-roller@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

infra/config/recipes.cfg

@@ -15,7 +15,7 @@
   "deps": {
     "recipe_engine": {
       "branch": "master",
-      "revision": "6d2596f2b4183b3abc59b92d0298e781e02d1687",
+      "revision": "cfff93afa16e61285e295d49f6aa2ba64642f330",
       "url": "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
     }
   },

recipes/recipe_modules/infra_paths/examples/full.expected/paths_buildbot_win.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show paths",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@result@base_paths: {'depot_tools': ('depot_tools',), 'build_internal': ('build_internal',), 'cache': ('build', 'slave', 'cache'), 'goma_cache': ('build', 'slave', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'build.dead'), 'build': ('build',), 'git_cache': ('build', 'slave', 'cache_dir'), 'root': (), 'tmp_base': ('/',)}@@@",
+      "@@@STEP_LOG_LINE@result@base_paths: {'depot_tools': ('depot_tools',), 'build_internal': ('build_internal',), 'cache': ('build', 'slave', 'cache'), 'goma_cache': ('build', 'slave', 'goma_cache'), 'start_dir': ('C:\\\\', 'b', 'FakeTestingCWD'), 'cleanup': ('C:\\\\', 'b', 'build.dead'), 'build': ('build',), 'git_cache': ('build', 'slave', 'cache_dir'), 'root': (), 'tmp_base': ('C:\\\\',)}@@@",
       "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
       "@@@STEP_LOG_END@result@@@"
     ]

recipes/recipe_modules/infra_paths/examples/full.expected/paths_generic_win.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show paths",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'builder'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'cleanup'), 'git_cache': ('/', 'b', 'c', 'git'), 'tmp_base': ('/',)}@@@",
+      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('C:\\\\', 'b', 'c', 'builder'), 'cache': ('C:\\\\', 'b', 'c'), 'goma_cache': ('C:\\\\', 'b', 'c', 'goma'), 'start_dir': ('C:\\\\', 'b', 'FakeTestingCWD'), 'cleanup': ('C:\\\\', 'b', 'cleanup'), 'git_cache': ('C:\\\\', 'b', 'c', 'git'), 'tmp_base': ('C:\\\\',)}@@@",
       "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
       "@@@STEP_LOG_END@result@@@"
     ]

recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show paths",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'cleanup'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
+      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('C:\\\\', 'b', 'c', 'b'), 'cache': ('C:\\\\', 'b', 'c'), 'goma_cache': ('C:\\\\', 'b', 'c', 'goma_cache'), 'start_dir': ('C:\\\\', 'b', 'FakeTestingCWD'), 'cleanup': ('C:\\\\', 'b', 'cleanup'), 'git_cache': ('C:\\\\', 'b', 'c', 'git_cache'), 'root': ('C:\\\\', 'b', 'FakeTestingCWD'), 'tmp_base': ('C:\\\\',)}@@@",
       "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
       "@@@STEP_LOG_END@result@@@"
     ]