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

* commit '47138a6e4a01e747f553b1f5165b7c5130763464':
  emulator opengl: pool of fixups to the host side.