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

* commit 'fedc39fb98b1f8d739fc477c73edd74c25284a79':