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

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