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

* commit '4222720f40bac14f88fb8b8a558c279e12515d07':
  Revert "EGL: Ensure surfaces are disconnected when destroyed"

Change-Id: I946f70337f34d92df9781d850a78902ac98ef6b5