Skia Gold: Fix Android stdout parsing.

src/tests/restricted_traces/restricted_trace_gold_tests.py

@@ -182,7 +182,7 @@ def get_skia_gold_keys(args):
         def append(self, line):
             if self.done_accepting_lines:
                 return
-            if 'android/test_runner.py' in line:
+            if 'Additional test environment' in line or 'android/test_runner.py' in line:
                 self.accepting_lines = False
                 self.is_android = True
             if ANDROID_BEGIN_SYSTEM_INFO in line:

src/tests/restricted_traces/skia_gold/angle_skia_gold_properties.py

@@ -3,7 +3,18 @@
 # found in the LICENSE file.
 """ANGLE implementation of //build/skia_gold_common/skia_gold_properties.py."""
 
+import os
+import sys
 import subprocess
+import sys
+
+d = os.path.dirname
+THIS_DIR = d(os.path.abspath(__file__))
+ANGLE_SRC_DIR = d(d(d(d(THIS_DIR))))
+sys.path.insert(0, os.path.join(ANGLE_SRC_DIR, 'build'))
+CHROMIUM_SRC_DIR = d(d(ANGLE_SRC_DIR))
+sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'build'))
+
 from skia_gold_common import skia_gold_properties
 
 

src/tests/restricted_traces/skia_gold/angle_skia_gold_session.py

@@ -3,6 +3,16 @@
 # found in the LICENSE file.
 """ANGLE implementation of //build/skia_gold_common/skia_gold_session.py."""
 
+import os
+import sys
+
+d = os.path.dirname
+THIS_DIR = d(os.path.abspath(__file__))
+ANGLE_SRC_DIR = d(d(d(d(THIS_DIR))))
+sys.path.insert(0, os.path.join(ANGLE_SRC_DIR, 'build'))
+CHROMIUM_SRC_DIR = d(d(ANGLE_SRC_DIR))
+sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'build'))
+
 from skia_gold_common import output_managerless_skia_gold_session as omsgs
 
 

src/tests/restricted_traces/skia_gold/angle_skia_gold_session_manager.py

@@ -3,6 +3,16 @@
 # found in the LICENSE file.
 """ANGLE implementation of //build/skia_gold_common/skia_gold_session_manager.py."""
 
+import os
+import sys
+
+d = os.path.dirname
+THIS_DIR = d(os.path.abspath(__file__))
+ANGLE_SRC_DIR = d(d(d(d(THIS_DIR))))
+sys.path.insert(0, os.path.join(ANGLE_SRC_DIR, 'build'))
+CHROMIUM_SRC_DIR = d(d(ANGLE_SRC_DIR))
+sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'build'))
+
 from skia_gold_common import skia_gold_session_manager as sgsm
 import angle_skia_gold_session