Merge "Use a dependency file to replace the list file."