am aa77b777: Merge "emulator opengl: some system egl fixes after a review."

* commit 'aa77b7776e6e86140f8112764d758dd426b71803':
  emulator opengl: some system egl fixes after a review.