Merged in recent changes to command buffer code.

gpu/command_buffer/client/gles2_c_lib_autogen.h

Index: gpu/command_buffer/client/gles2_c_lib_autogen.h
===================================================================
--- gpu/command_buffer/client/gles2_c_lib_autogen.h	(revision 33021)
+++ gpu/command_buffer/client/gles2_c_lib_autogen.h	(working copy)
@@ -214,7 +214,7 @@
     GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) {
   gles2::GetGLContext()->GetAttachedShaders(program, maxcount, count, shaders);
 }
-int GLES2GetAttribLocation(GLuint program, const char* name) {
+GLint GLES2GetAttribLocation(GLuint program, const char* name) {
   return gles2::GetGLContext()->GetAttribLocation(program, name);
 }
 void GLES2GetBooleanv(GLenum pname, GLboolean* params) {
@@ -280,7 +280,7 @@
 void GLES2GetUniformiv(GLuint program, GLint location, GLint* params) {
   gles2::GetGLContext()->GetUniformiv(program, location, params);
 }
-int GLES2GetUniformLocation(GLuint program, const char* name) {
+GLint GLES2GetUniformLocation(GLuint program, const char* name) {
   return gles2::GetGLContext()->GetUniformLocation(program, name);
 }
 void GLES2GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) {