am 608383de: am 3e51ea6b: Merge "opengl emulator: Added gl error tracking on the guest (encoder)"

* commit '608383decf0f02f90d9f0f2d6256fe1070fa6bbf':
  opengl emulator: Added gl error tracking on the guest (encoder)