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

* commit '8713e3858c8868af8b89d1bad8b181f4570b3a1e':
  opengles emulator: fix eglGetError