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

* commit '1c3928257011bfdfd9d8f1cd44a0bf361b71fa55':
  Revert "EGL: Ensure surfaces are disconnected when destroyed"

Change-Id: I786e3fbf4ff1795ae95039bccdd570dd300c0f91