am 81103f12: am 553cbb25: Merge "SurfaceFlinger: Handle EGL errors more cleanly"

* commit '81103f128d651d705c90b3ab9fe55bff674320ef':
  SurfaceFlinger: Handle EGL errors more cleanly