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

* commit '5c73fb2c765bef26fc2f21aa52747a18c7b39e68':
  Revert "EGL: Ensure surfaces are disconnected when destroyed"

Change-Id: Id715a1ae50f3701aed201d5c9b5afa31f9709112