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