[GPU Workaround] Re-enable disable_chromium_framebuffer_multisample on Nexus 7g2 and alike

gpu/config/gpu_driver_bug_list_json.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Determines whether a certain driver bug exists in the current system.
 // The format of a valid gpu_driver_bug_list.json file is defined in
 // <gpu/config/gpu_control_list_format.txt>.
 // The supported "features" can be found in
 // <gpu/config/gpu_driver_bug_workaround_type.h>.
 
@@ skipping 2303 matching lines @@
       "gl_vendor": "ARM.*",
       "gl_renderer": "Mali-G.*",
       "features": [
         "use_virtualized_gl_contexts"
       ]
     },
 )  // LONG_STRING_CONST macro
 // Avoid C2026 (string too big) error on VisualStudio.
 LONG_STRING_CONST(
     {
+      // Corresponds to software rendering list #140.
       "id": 214,
       "description": "Certain versions of Qualcomm driver don't setup scissor state correctly when FBO0 is bound.",
-      "cr_bugs": [670607, 696627],
+      "cr_bugs": [670607, 696627, 698197],
       "gl_vendor": "Qualcomm.*",
       "machine_model_name": ["Nexus 7", "KFTHWI", "KFSAWI", "KFAPWI", "KFTHWA", "KFSAWA", "KFAPWA"],
       "features": [
-        "force_update_scissor_state_when_binding_fbo0"
+        "force_update_scissor_state_when_binding_fbo0",
+        // Somehow the main workaround above won't work without the one below.
+        // See https://crbug.com/698197 for details.
+        "disable_chromium_framebuffer_multisample"
       ]
     },
     {
       "id": 215,
       "description": "Fake no-op GPU driver bug workaround for testing",
       "cr_bugs": [682912],
       "vendor_id": "0xbad9",
       "device_id": ["0xbad9"],
       "features": [
         "use_gpu_driver_workaround_for_testing"
@@ skipping 40 matching lines @@
       ]
     }
   ]
   // Please update the version number at beginning of this file whenever you
   // change this file.
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu