Remove support for duplicate file entries

Bug: 8219321
Change-Id: Ibc56bea753917c38e1bb20df48aa45fdff39d364
Merge remote-tracking branch 'cm/gingerbread' into gingerbread