am 835aef2c: Merge "emulator: opengl: Fix Mac and Windows builds."

* commit '835aef2ce8f1e63454868471d5184a13f8b2415b':
  emulator: opengl: Fix Mac and Windows builds.