am 3f5c9555: Merge "emulator opengl: pool of fixups to the system components."

* commit '3f5c95553a0cf67881fa5a722571747fc6d46128':
  emulator opengl: pool of fixups to the system components.