Merge "Avoid generating cdex for dex files with duplicate methods"
am: 6568c1c52c

Change-Id: I989dad0a3a0b1c57c07c072c3a136a41a3ddb33e