[automerger skipped] Merge "EGL: add a missing native_window_api_disconnect" am: c8fb8bd760 am: 6d82fa64b7
am: b76aac700b  -s ours

Change-Id: Ief8244fc87909e5aaf5ac662276f6ae328de9318