Merge "Make original dex file be more deduplicated"