Merge "Revert "Revert "Make original dex file be more deduplicated"""