Merge "Revert "EGL: Ensure surfaces are disconnected when destroyed"" into nyc-dev
am: 5882a26

* commit '5882a267d0bee5e9505fe4e714f50378f5ef70d0':
  Revert "EGL: Ensure surfaces are disconnected when destroyed"

Change-Id: I1e97aacf8290d38fddd9bd7bebffdc0ed8a7d2ef