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

Change-Id: I59aa7eb0e96548d5cf3faff9c1e02b3491e0db16