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

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