Merge "use fs_config and file_contexts from target_files"