Merge "Fix GLES2 negative test issues."