Check for more failing strings in Gradle output

Change-Id: I44acf8e7d12664aeb4a8bdcddfe7703fd1a54ba3

tools/run_on_as_app.py

diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index 8b87f84..e645fb0 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -748,10 +748,13 @@
   unsigned_apk = os.path.join(build_output_apks, unsigned_apk_name)
 
   assert os.path.isfile(signed_apk) or os.path.isfile(unsigned_apk), (
-      "Expected a file to be present at {} or {}, found: {}".format(
-          signed_apk, unsigned_apk,
+      "Expected a file to be present at {} or {}, found: {}\n"
+      "Standard out from compilation: {}".format(
+          signed_apk,
+          unsigned_apk,
           ', '.join(
-              as_utils.ListFiles(build_dir, lambda x : x.endswith('.apk')))))
+              as_utils.ListFiles(build_dir, lambda x : x.endswith('.apk'))),
+          stdout))
 
   if options.sign_apks and not os.path.isfile(signed_apk):
     assert os.path.isfile(unsigned_apk)

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index cede4c7..67ead07 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -191,7 +191,10 @@
       if ('AssertionError:' in stripped
           or 'CompilationError:' in stripped
           or 'CompilationFailedException:' in stripped
-          or 'Compilation failed' in stripped):
+          or 'Compilation failed' in stripped
+          or 'FAILURE:' in stripped
+          or 'org.gradle.api.ProjectConfigurationException' in stripped
+          or 'BUILD FAILED' in stripped):
         failed = True
     else:
       if logger: