Merge "Check for duplicate entries when using dexlayout" am: 3fb852a88d am: f0110c2679
am: 7045ccd350

Change-Id: Iff4f5352691c0594780639e7cabad2c21301ae2e