am 91acad1a: am 1c39202b: Merge "emulator opengl: pool of fixups to the host side."

* commit '91acad1afa6ec9ce7f17348bed3353c45013c2ae':
  emulator opengl: pool of fixups to the host side.