Merge "opengles emulator: GLES memory leaks"