am a2c959d5: Merge "fixes for gles2 tests"

* commit 'a2c959d5450faeed87b020f74f2e8ac21eaef9b3':
  fixes for gles2 tests