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

* commit '47948791864ccaecac21d94c30a428b549247b67':
  SurfaceFlinger: Handle EGL errors more cleanly