Android: enable/disable WebRTC HW H264 with a flag.

gpu/config/software_rendering_list_json.cc

Index: gpu/config/software_rendering_list_json.cc
diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index 7c61694d38eaba6281130a392abb34f539cceae1..86f081ef0b16aa856669984669b2260f7f06fe08 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/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": "11.16",
+  "version": "11.17",
   "entries": [
     {
       "id": 1,
@@ -691,6 +691,17 @@ LONG_STRING_CONST(
       ]
     },
     {
+      "id": 82,
+      "description": "MediaCodec is still too buggy to use for encoding (b/11536167)",
+      "cr_bugs": [615108],
+      "os": {
+        "type": "android"
+      },
+      "features": [
+        "accelerated_video_encode"
+      ]
+    },
+    {
       "id": 86,
       "description": "Intel Graphics Media Accelerator 3150 causes the GPU process to hang running WebGL",
       "cr_bugs": [305431],