Revert of [Reland] Upgrade to new Android SDK.

components/cronet/tools/generate_javadoc.py

Index: components/cronet/tools/generate_javadoc.py
diff --git a/components/cronet/tools/generate_javadoc.py b/components/cronet/tools/generate_javadoc.py
index 7a4b98925861e94208a2e7817a0ebf48da1031be..3914b91ed235643cbecda7911d1e3ebce6bdf5d6 100755
--- a/components/cronet/tools/generate_javadoc.py
+++ b/components/cronet/tools/generate_javadoc.py
@@ -43,15 +43,9 @@
              '-Dlib.java.dir=' + lib_java_dir, '-Doverview=' + overview_file,
              'doc']
   stdout = build_utils.CheckOutput(javadoc_cmd, cwd=working_dir)
-  for line in stdout.splitlines():
-    if " error: " in line or "javadoc: error " in line:
-      build_utils.DeleteDirectory(output_dir)
-      raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
-    # TODO(crbug.com/655666): remove compiler  suppression warning once fixed.
-    if ("warning" in line and not line.endswith('warnings') and
-        not "the highest major version" in line):
-      build_utils.DeleteDirectory(output_dir)
-      raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
+  if " error: " in stdout or "warning" in stdout or "javadoc: error " in stdout:
+    build_utils.DeleteDirectory(output_dir)
+    raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
 
 
 def main():