Expand 2 Linux/NVIDIA workarounds to Android/NVIDIA

pack_parameters_workaround_with_pack_buffer fixes
conformance2/reading/read-pixels-pack-parameters.html

unpack_alignment_workaround_with_unpack_buffer fixes
conformance2/textures/misc/tex-unpack-params.html

BUG=698926
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2735823003
Cr-Commit-Position: refs/heads/master@{#455394}
(cherry picked from commit 08e70dd)

Review-Url: https://codereview.chromium.org/2737243002 .
Cr-Commit-Position: refs/branch-heads/3029@{#74}
Cr-Branched-From: 939b32e-refs/heads/master@{#454471}

gpu/config/gpu_driver_bug_list_json.cc

@@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
 {
   "name": "gpu driver bug list",
   // Please update the version number whenever you change this file.
-  "version": "9.32",
+  "version": "9.33",
   "entries": [
     {
       "id": 1,
@@ -2339,6 +2339,30 @@ LONG_STRING_CONST(
       "features": [
         "use_gpu_driver_workaround_for_testing"
       ]
+    },
+    {
+      "id": 216,
+      "cr_bugs": [698926],
+      "description": "Pack parameters work incorrectly with pack buffer bound",
+      "os": {
+        "type": "android"
+      },
+      "gl_vendor": "NVIDIA.*",
+      "features": [
+        "pack_parameters_workaround_with_pack_buffer"
+      ]
+    },
+    {
+      "id": 217,
+      "cr_bugs": [698926],
+      "description": "Alignment works incorrectly with unpack buffer bound",
+      "os": {
+        "type": "android"
+      },
+      "gl_vendor": "NVIDIA.*",
+      "features": [
+        "unpack_alignment_workaround_with_unpack_buffer"
+      ]
     }
   ]
   // Please update the version number at beginning of this file whenever you