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