Update from https://crrev.com/327068

build/android/PRESUBMIT.py

Index: build/android/PRESUBMIT.py
diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py
index d1daaf24d1e1a35e242c212f8fdc2c88ddde885d..92095be8ef903bba67f9b53e6f3d6b03ac204f5f 100644
--- a/build/android/PRESUBMIT.py
+++ b/build/android/PRESUBMIT.py
@@ -8,25 +8,6 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
 details on the presubmit API built into depot_tools.
 """
 
-_DELETIONS_ONLY_FILES = (
-    'build/android/findbugs_filter/findbugs_known_bugs.txt',
-)
-
-
-def _CheckDeletionsOnlyFiles(input_api, output_api):
-  """Check that a certain listed files only have deletions.
-  """
-  warnings = []
-  for f in input_api.AffectedFiles():
-    if f.LocalPath() in _DELETIONS_ONLY_FILES:
-      if f.ChangedContents():
-        warnings.append(f.LocalPath())
-  results = []
-  if warnings:
-    results.append(output_api.PresubmitPromptWarning(
-        'Following files should only contain deletions.', warnings))
-  return results
-
 
 def CommonChecks(input_api, output_api):
   output = []
@@ -61,6 +42,7 @@ def CommonChecks(input_api, output_api):
       input_api,
       output_api,
       unit_tests=[
+          J('pylib', 'device', 'battery_utils_test.py'),
           J('pylib', 'device', 'device_utils_test.py'),
           J('pylib', 'device', 'logcat_monitor_test.py'),
           J('pylib', 'gtest', 'gtest_test_instance_test.py'),
@@ -70,8 +52,6 @@ def CommonChecks(input_api, output_api):
           J('pylib', 'utils', 'md5sum_test.py'),
       ],
       env=pylib_test_env))
-  # TODO(jbudorick): Reenable this check once upstreaming is finished.
-  # output.extend(_CheckDeletionsOnlyFiles(input_api, output_api))
   return output