Merge "Skip stripping 16K GKI kernel modules" into main