Remove upright-matrix- configs from Android bots

tools/dm_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 = []
 
-  configs = ['565', '8888', 'gpu', 'upright-matrix-8888', 'upright-matrix-gpu']
+  configs = ['565', '8888', 'gpu']
 
-  args.extend('--matrix 0 1 1 0'.split(' '))
+  if 'Android' not in bot:
+    configs.extend(('upright-matrix-8888', 'upright-matrix-gpu'))
+    args.extend('--matrix 0 1 1 0'.split(' '))
 
   if 'TegraK1' in bot or 'GTX550Ti' in bot or 'GTX660' in bot or 'GT610' in bot:
     if 'Android' in bot:
       configs.append('nvprmsaa4')
     else:
       configs.append('nvprmsaa16')
 
   # The S4 crashes and the NP produces a long error stream when we run with
   # MSAA.  The Tegra2 and Tegra3 just don't support it.
   if ('GalaxyS4'    not in bot and
@@ skipping 165 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)