Merge "Handle de-duped CodeItems in dexlayout"
am: 6291ac8408

Change-Id: I5e83154ffe0f9cc32e4d4248649fa3bae348c407