am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"

* commit 'e3ca49a9495e5cd36b5cd3bcd163e11758a4e4cf':
  fixes for gles2 tests