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

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