am 0a78cb7f: am b4669d5d: Merge "emulator: opengl: Fix Mac build"

* commit '0a78cb7f625ec5ca08c494a6811975db9bf7dcaa':
  emulator: opengl: Fix Mac build