Merge "EGL: add a missing native_window_api_disconnect" am: c8fb8bd760
am: 6d82fa64b7

Change-Id: Iba5ffa6f42bdb2d33be67edae1b7d9bde75d266e