am 59970b6d: am 7304f16f: am 8f709075: am 3f5c9555: Merge "emulator opengl: pool of fixups to the system components."

* commit '59970b6d1156581c1aa983cde4c89ea9e0343aac':
  emulator opengl: pool of fixups to the system components.