Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES"