Remove upright-matrix- configs from Android bots

tools/dm_flags.json

Index: tools/dm_flags.json
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 9c329af8e8e957ea918db8d03acc6ead6dfed8e7..469e2ae48c3930046bb735ab348b86264119233f 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -161,17 +161,10 @@
     "~WritePixels"
   ], 
   "Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug": [
-    "--matrix", 
-    "0", 
-    "1", 
-    "1", 
-    "0", 
     "--config", 
     "565", 
     "8888", 
     "gpu", 
-    "upright-matrix-8888", 
-    "upright-matrix-gpu", 
     "msaa4", 
     "serialize-8888", 
     "tiles_rt-8888", 
@@ -322,17 +315,10 @@
     "~desk_yahoonews_0"
   ], 
   "Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release": [
-    "--matrix", 
-    "0", 
-    "1", 
-    "1", 
-    "0", 
     "--config", 
     "565", 
     "8888", 
     "gpu", 
-    "upright-matrix-8888", 
-    "upright-matrix-gpu", 
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
@@ -485,17 +471,10 @@
     "~desk_yahoonews_0"
   ], 
   "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release": [
-    "--matrix", 
-    "0", 
-    "1", 
-    "1", 
-    "0", 
     "--config", 
     "565", 
     "8888", 
     "gpu", 
-    "upright-matrix-8888", 
-    "upright-matrix-gpu", 
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
@@ -642,17 +621,10 @@
     "~desk_yahoonews_0"
   ], 
   "Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug": [
-    "--matrix", 
-    "0", 
-    "1", 
-    "1", 
-    "0", 
     "--config", 
     "565", 
     "8888", 
     "gpu", 
-    "upright-matrix-8888", 
-    "upright-matrix-gpu", 
     "nvprmsaa4", 
     "msaa4", 
     "serialize-8888", 
@@ -801,17 +773,10 @@
     "~desk_yahoonews_0"
   ], 
   "Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
-    "--matrix", 
-    "0", 
-    "1", 
-    "1", 
-    "0", 
     "--config", 
     "565", 
     "8888", 
     "gpu", 
-    "upright-matrix-8888", 
-    "upright-matrix-gpu", 
     "--blacklist", 
     "gpu", 
     "_",