Merge "Add logic for deduplicating in dexlayout"