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

* commit '3b987d0cd7225feee6813a4893eeefe4f0974d40':
  fixes for gles2 tests