Merge "fixes for gles2 tests"