am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface"

* commit 'ae9610220b5f509687b840532f95f3638ee0146b':
  EGL: Fix error for eglCreateWindowSurface