Merge "SurfaceFlinger: Handle EGL errors more cleanly" into mnc-dev