am b3dbf9b0: am 02acec79: Merge "emulator:opengl: fix windows build"

* commit 'b3dbf9b05db277d5cef44c1fd319c493c4f08eba':
  emulator:opengl: fix windows build