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

* commit 'b01334e6a2f20eeded55e938d18e8e664dcfdf6e':
  EGL: Ensure surfaces are disconnected when destroyed

Change-Id: Iafc5e10e5f5faeaff28ca1814fd24dd01761667d