am 6bb95113: Merge "opengles emulator: GLES memory leaks"

* commit '6bb9511365bb64772e35b8b7bfbb0fdbabb0cec4':
  opengles emulator: GLES memory leaks