Merge "Revert "Make original dex file be more deduplicated""
am: ca32c317ee

Change-Id: I3738fb587a51a848e3fbb1106242abbad94483fd