Reland of Pass --images '' to nanobench to disable image benchmarking.

tools/nanobench_flags.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
@@ skipping 11 matching lines @@
 
 def lineno():
   caller = inspect.stack()[1]  # Up one level to our caller.
   return inspect.getframeinfo(caller[0]).lineno
 
 
 cov_start = lineno()+1   # We care about coverage starting just past this def.
 def get_args(bot):
   args = []
 
+  # Temporarily disable image benchmarking.
+  args.append('--images')
+
   if 'Appurify' not in bot:
     args.extend(['--scales', '1.0', '1.1'])
 
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
   if 'Appurify' not in bot:
     config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
     # The S4 crashes and the NP produces a long error stream when we run with
     # MSAA.
@@ skipping 77 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_args(sys.argv[2]), out)