Merge "Reapply "Define vintf_fragments as modules"" into main