Merge "Replace lists of aconfig modules with aconfig_declarations_group" into main