Merge "Check for duplicate entries when using dexlayout"