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

* commit '13cd2cd4f57ce3e005f8d5c150c0cd3c4daf386d':
  emulator: opengl: fix the build