Merge "Allow dexlayout to handle duplicate code items." am: a0182240 am: 80460bbd am: 3f7286d4 am: 35e6ab36 Change-Id: I9e338e1f79b449da2498fa7d3690f241c864cbdc