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

* commit 'e8dd10402939bee999f604f4eb000c0eb798101e':