GN: Android perf/tests

infra/bots/recipes/swarm_perf.py

Index: infra/bots/recipes/swarm_perf.py
diff --git a/infra/bots/recipes/swarm_perf.py b/infra/bots/recipes/swarm_perf.py
index 8c631366a12b264c96c6095ee0414c579069553d..1149dfc8ac9b4e14871dbbb8cca9c641f1c998f0 100644
--- a/infra/bots/recipes/swarm_perf.py
+++ b/infra/bots/recipes/swarm_perf.py
@@ -58,7 +58,8 @@ def nanobench_flags(bot):
     args.extend(['--skps', 'ignore_skps'])
 
   config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui' ]
-  config += [ 'f16', 'srgb' ]
+  if 'AndroidOne' not in bot:
+    config += [ 'f16', 'srgb' ]
   # The S4 crashes and the NP produces a long error stream when we run with
   # MSAA.
   if ('GalaxyS4'    not in bot and
@@ -235,9 +236,11 @@ def perf_steps(api):
 
 def RunSteps(api):
   api.core.setup()
-  api.flavor.install()
-  perf_steps(api)
-  api.flavor.cleanup_steps()
+  try:
+    api.flavor.install()
+    perf_steps(api)
+  finally:
+    api.flavor.cleanup_steps()
   api.run.check_failure()