Merge "Handle de-duped CodeItems in dexlayout"