Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread