am ef1e9fa0: am 490bb2af: Merge "opengles emulator: GLES fix memory leaks"

* commit 'ef1e9fa0205b4d6499cf8a414f2d407f6ba77388':
  opengles emulator: GLES fix memory leaks