Revert of nanobench: turn on f16 and sRGB on the bots

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 26 matching lines @@
     args.extend(['--useThermalManager', '1,1,10,1000'])
 
   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']
-    config.extend(['srgb', 'f16'])
     # The S4 crashes and the NP produces a long error stream when we run with
     # MSAA.
     if ('GalaxyS4'    not in bot and
         'NexusPlayer' not in bot):
       if 'Android' in bot:
         config.extend(['msaa4', 'nvprmsaa4'])
       else:
         config.extend(['msaa16', 'nvprmsaa16'])
     args.append('--config')
     args.extend(config)
@@ skipping 111 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)