Update from https://crrev.com/305340

tools/android/checkstyle/checkstyle.py

 # Copyright 2013 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.
 
 """Script that is used by PRESUBMIT.py to run style checks on Java files."""
 
 import os
 import subprocess
 import xml.dom.minidom
 
 
 CHROMIUM_SRC = os.path.normpath(
     os.path.join(os.path.dirname(__file__),
                  os.pardir, os.pardir, os.pardir))
 CHECKSTYLE_ROOT = os.path.join(CHROMIUM_SRC, 'third_party', 'checkstyle',
-                               'checkstyle-5.9-all.jar')
+                               'checkstyle-6.1-all.jar')
 
 
 def RunCheckstyle(input_api, output_api, style_file):
   if not os.path.exists(style_file):
     file_error = ('  Java checkstyle configuration file is missing: '
                   + style_file)
     return [output_api.PresubmitError(file_error)]
 
   # Filter out non-Java files and files that were deleted.
   java_files = [x.LocalPath() for x in input_api.AffectedFiles(False, False)
@@ skipping 40 matching lines @@
         result_errors.append(result)
       elif severity == 'warning':
         result_warnings.append(result)
 
   result = []
   if result_warnings:
     result.append(output_api.PresubmitPromptWarning('\n'.join(result_warnings)))
   if result_errors:
     result.append(output_api.PresubmitError('\n'.join(result_errors)))
   return result