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

Change-Id: I9f41139351beca83b910d1c119fac574d6ec9ff0