Merge "gltrace: fixup data for glTexSubImage2D & glDeleteBuffers"