Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"