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

* commit '36d88e483ea531c702d018ceb67d316cb59c9f72':