Merge "EGL: Ensure surfaces are disconnected when destroyed" into nyc-dev am: b01334e
am: 8778a32

* commit '8778a322c73b4739f2ab1ade8f86293e4713824f':
  EGL: Ensure surfaces are disconnected when destroyed

Change-Id: Iba1983285868eaa18d9aa4d8d99b909977b48afa