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

* commit '99438f59cb95616167dd90fd220191958093aed6':

Change-Id: I8081a7c83beefda6e861ba338fa87295878bcf82