am 833d1a4e: am 6c812a6e: Merge "opengles emulator: libEGL fixes for ATI driver on windows."

* commit '833d1a4e336167865db43fe155e29f606d2a8757':
  opengles emulator: libEGL fixes for ATI driver on windows.