Merge "fs_config: fix fs_config_*_system targets"