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

Change-Id: Ied679c1eb0d83ed101a7773189cc594ef117828d