am 975a39ba: am 26aad35e: Merge "emulator opengl: typo caused the decoder to crash"

* commit '975a39baa3d779a1972100c11fe7d9447b2feae8':
  emulator opengl: typo caused the decoder to crash