am 1639334c: am f149b4f0: Merge "opengl emulator: fix windows build"

* commit '1639334c53cb51476d4fa07c50facfe75a001692':
  opengl emulator: fix windows build