Revert some reordering to minimize the diff against master.
Add a missing EGLPlatformDefault.h include in GLContextEGL.cpp.
Check that the EGLSurface does not equal EGL_NO_SURFACE rather than EGL_NO_CONTEXT.
Revert the GLContextEGL::cairoDevice cleanup for now.