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

* commit '94d4f55f1c0a1fea067100ec2867429173de30b6':
  emulator opengl: fix windows build