am 84e83659: am 13cd2cd4: am 56eca4e0: Merge "emulator: opengl: fix the build"

* commit '84e836590e5fb655c7fd1f49613a4ae9cd2fa963':
  emulator: opengl: fix the build