Merge "Merge "EGL: Disconnect native window in eglDestroySurface" into nyc-dev am: 1ae52ea860 am: fc44e400cd" into nyc-mr1-dev-plus-aosp