Unify GPU raster and canvas blacklists on Android, second attempt.

Accelerated canvas and GPU raster both use the same Skia codepaths and
have generally displayed the same bugs.  It doesn't make sense to
blacklist one but not the other.  Since GPU raster sees more usage than
canvas nowadays, and I researched GPU raster compatibility as part of
https://codereview.chromium.org/760053003, it makes sense to fold canvas
into the same blacklist.

This immediately fixes an Adreno 225 canvas bug which slipped through a
driver-reported-version based blacklist, which is apparently unreliable
and which I deleted in this patch.  More generally it also should avoid
this kind of issue in the future.

This patch is similar to the previous version, but also makes the
Mali-T604 blacklist entry specific to Android, since it was
inadvertently affecting ChromeOS.

BUG=453283,454547

Review URL: https://codereview.chromium.org/899743002

Cr-Commit-Position: refs/heads/master@{#314637}

gpu/config/software_rendering_list_json.cc

@@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "9.16",
+  "version": "9.17",
   "entries": [
     {
       "id": 1,
@@ -620,22 +620,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
         "accelerated_video_decode"
       ]
     },
-    {
-      "id": 62,
-      "description": "Accelerated 2D canvas buggy on old Qualcomm Adreno",
-      "cr_bugs": [161575],
-      "os": {
-        "type": "android"
-      },
-      "gl_renderer": ".*Adreno.*",
-      "driver_version": {
-        "op": "<",
-        "value": "4.1"
-      },
-      "features": [
-        "accelerated_2d_canvas"
-      ]
-    },
     {
       "id": 64,
       "description": "Hardware video decode is only supported in win7+",
@@ -1035,7 +1019,7 @@ LONG_STRING_CONST(
     },
     {
       "id": 96,
-      "description": "GPU rasterization whitelist",
+      "description": "Blacklist GPU raster/canvas on all except known good GPUs and newer Android releases",
       "cr_bugs": [362779,424970],
       "os": {
         "type": "android"
@@ -1090,7 +1074,8 @@ LONG_STRING_CONST(
         }
       ],
       "features": [
-        "gpu_rasterization"
+        "gpu_rasterization",
+        "accelerated_2d_canvas"
       ]
     },
     {
@@ -1110,11 +1095,15 @@ LONG_STRING_CONST(
     },
     {
       "id": 100,
-      "description": "GPU rasterization is blacklisted on Nexus 10",
+      "description": "GPU rasterization and canvas is blacklisted on Nexus 10",
       "cr_bugs": [407144],
+      "os": {
+        "type": "android"
+      },
       "gl_renderer": ".*Mali-T604.*",
       "features": [
-        "gpu_rasterization"
+        "gpu_rasterization",
+        "accelerated_2d_canvas"
       ]
     },
     {