Merge "Better support for openGLES 2.0 extensions" into studio-1.4-dev