Fix various stray bugs in the GN auto-roller, and repair the DEPS file.

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 33 matching lines @@
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
   'swarming_revision': '2866a22530cb65feae5d9f64c83636aed5391d06',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
   'angle_revision': '6d51c70ccf63a2c5ec240d960ff1bc179d36c92c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling build tools
   # and whatever else without interference from each other.
-  'buildtools_revision': '565d04e8741429fb1b4f26d102f2c6c3b849edeb',  # the commit queue can handle CLs rolling PDFium
+  'buildtools_revision': '565d04e8741429fb1b4f26d102f2c6c3b849edeb',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling PDFium
   # and whatever else without interference from each other.
   'pdfium_revision': 'fdc8f439e854a2636e7d22d7104bf08cf5620b0b',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling openmax_dl
   # and whatever else without interference from each other.
   'openmax_dl_revision': '22bb1085a6a0f6f3589a8c3d60ed0a9b82248275',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling BoringSSL
   # and whatever else without interference from each other.
   'boringssl_revision': '2deb984187ce8f6c739c780e7fe95e859e93b3da',
@@ skipping 736 matching lines @@
     'pattern': '.',
     'action': [
         'python',
         'src/tools/check_git_config.py',
         '--running-as-hook',
     ],
   },
 ]