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

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