Fix problems with angle bot's configurations

tools/bench_pictures.cfg

Index: tools/bench_pictures.cfg
diff --git a/tools/bench_pictures.cfg b/tools/bench_pictures.cfg
index 78db4971b99cf4928e121d1b03999e03f6cd3022..2628e5091dad0433d2237571703fb501b6a3b092 100644
--- a/tools/bench_pictures.cfg
+++ b/tools/bench_pictures.cfg
@@ -65,13 +65,13 @@ msaa16 = Config(config='msaa16', viewport=[str(DEFAULT_VIEWPORT_X),
                                            str(DEFAULT_VIEWPORT_Y)])
 
 viewport_angle = Config(config='angle',
-                        viewport=[DEFAULT_TILE_X, DEFAULT_TILE_Y])
+                        viewport=[DEFAULT_VIEWPORT_X, DEFAULT_VIEWPORT_Y])
 
 # This dictionary defines the sets of configs for all platforms. Each config is
 # a dictionary of key/value pairs directly corresponding to the command-line
 # flags passed to bench_pictures.
 bench_pictures_cfg = {
-  'angle': [viewport_angle, msaa4],
+  'angle': [viewport_angle],
   'debug': [ViewportBitmapConfig(DEFAULT_VIEWPORT_X, DEFAULT_VIEWPORT_Y)],
   'default': default_configs,
   'no_gpu': default_no_gpu,