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

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