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

* commit 'bfeff06fd822b795f5a08dc07dd01a78636b3af8':

Change-Id: If86f2591bb7c6fd84fa8fbbeb3f601794ca52772