Small fix to GL ES 2.0 codepath (less aggressive #ifdef exclusion).
gles2rice: Merge 'upstream/video-rice' hg:e25d038c196cb7c8cd4dd71839f1994c1257b2ae