Merge "Revert "Set the appropriate deps property for the soong generated fs modules"" into main