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

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