Merge "Remove dependency on EGL private headers"