am 4aaa292a: am 160dd055: am 4beeee87: Revert "Remove support for duplicate file entries."

* commit '4aaa292a38a4201146c37d04fa3d566ce1e17e54':
  Revert "Remove support for duplicate file entries."