[Android] Add workaround to unbind gpu memory buffer only on NVIDIA

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 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.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 5764 matching lines @@
   if (textarget != GL_TEXTURE_2D)
     return;
   // Image is still in use if texture is attached to a framebuffer.
   if (texture && !texture->IsAttachedToFramebuffer()) {
     gfx::GLImage* image = texture->GetLevelImage(textarget, 0);
     if (image) {
       ScopedGLErrorSuppressor suppressor(
           "GLES2DecoderImpl::DoDidUseTexImageIfNeeded",
           GetErrorState());
       glBindTexture(textarget, texture->service_id());
-      image->DidUseTexImage();
+      image->DidUseTexImage(
+          workarounds().unbind_image_target_texture_before_lock);
       RestoreCurrentTexture2DBindings(&state_);
     }
   }
 }
 
 bool GLES2DecoderImpl::PrepareTexturesForRender() {
   DCHECK(state_.current_program.get());
   if (!texture_manager()->HaveUnrenderableTextures() &&
       !texture_manager()->HaveImages() &&
       !features().oes_egl_image_external) {
@@ skipping 76 matching lines @@
         }
 
         Texture* texture = texture_ref->texture();
         if (texture_unit.bind_target == GL_TEXTURE_2D) {
           gfx::GLImage* image = texture->GetLevelImage(
               texture_unit.bind_target, 0);
           if (image && !texture->IsAttachedToFramebuffer()) {
             ScopedGLErrorSuppressor suppressor(
                 "GLES2DecoderImpl::RestoreStateForTextures", GetErrorState());
             glActiveTexture(GL_TEXTURE0 + texture_unit_index);
-            image->DidUseTexImage();
+            image->DidUseTexImage(
+                workarounds().unbind_image_target_texture_before_lock);
             continue;
           }
         }
       }
     }
   }
   // Set the active texture back to whatever the user had it as.
   glActiveTexture(GL_TEXTURE0 + state_.active_texture_unit);
 }
 
@@ skipping 4506 matching lines @@
   DoDidUseTexImageIfNeeded(texture, texture->target());
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu