Merge "Avoid generating cdex for dex files with duplicate methods"