Merge "Allow dexlayout to handle duplicate code items." into oc-dev