Trivial fixes for API change in OpenGL2 shaders

Change-Id: I56bac0a6c7e0ea098708da480f063979a35b1fab
Merge topic 'opengl2-minor-fixes' into master

b566db36 Trivial fixes for API change in OpenGL2 shaders