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

* commit '490bb2afed0cc94401749431ccbc5c952888a4f7':
  opengles emulator: GLES fix memory leaks