Merge "opengles emulator: fixed EGLContext and EGLSurface ref-counting."