Merge "opengl: Un-hide GLES31 and GLES31Ext classes"