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

* commit '160dd0552b2df159dec511715ed48c4420305fdb':
  Revert "Remove support for duplicate file entries."