Merge "gltrace: Patch up all glUniform*() calls."