am 0c06eaf3: am ebc56952: Merge "emulator opengl: fix windows build"

* commit '0c06eaf38c9982bc3ede0c351f4f0165f59283b0':
  emulator opengl: fix windows build