Test msaa on bots using dm. 4 samples for Android, 16 elsewhere

tools/dm_flags.py

Index: tools/dm_flags.py
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 985a62adf573e2cad0110187b64924cd942bb368..a7ed8ca7afaf804f93bd63633fea4c74f68c631c 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -22,7 +22,16 @@ cov_start = lineno()+1   # We care about coverage starting just past this def.
 def get_args(bot):
   args = []
 
-  configs = ['565', '8888', 'gpu', 'nvprmsaa4']
+  configs = ['565', '8888', 'gpu']
+  # 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:
+      configs.extend(['msaa4', 'nvprmsaa4'])
+    else:
+      configs.extend(['msaa16', 'nvprmsaa16'])
+
   # Xoom and NP are running out of RAM when we run all these modes.  skia:3255
   if ('Xoom'        not in bot and
       'NexusPlayer' not in bot):