am a99d26b7: am 843b12a8: am 6b26de17: am 5360af4a: Remove support for duplicate file entries.

* commit 'a99d26b7f27066c0fe9b5ce9d0208c3540ccaf37':