Merge "EGL migration to native"