am 3ef2b6bf: Merge "emulator opengl: more few fixups needed for the system to load."

* commit '3ef2b6bfdfcf6dd81f182c96bf298ec057dc60ef':
  emulator opengl: more few fixups needed for the system to load.