Merge "Support OpenGL ES 3.0 in OpenGlEsVersionTest" into jb-mr2-dev