Merge "check that the NativeWindowType is valid in eglCreateWindowSurface"