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

Change-Id: I7180a7be2aa48ad753043a3ded8e598308b94a6e