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

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