am 6d60667d: Merge "Use a dependency file to replace the list file."

* commit '6d60667de6b8e6bd8a54fb4031901e2935743308':
  Use a dependency file to replace the list file.