Merge "SurfaceFlinger: Handle EGL errors more cleanly"