am ecb7c06f: am 321714ab: Merge "opengles emulator: fix eglGetError"

* commit 'ecb7c06ff4a670ea473ac053aaa9c0f99f4e0bf6':
  opengles emulator: fix eglGetError