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

* commit '11540e0aaf9bd88693902cd7aa3fa75e4c8bd614':
  emulator: opengl: Fix Mac and Windows builds.