Merge "Revert "Revert "Make original dex file be more deduplicated""" am: 7f56a7459f
am: c3139e8e71

Change-Id: Icab00bc38338cb9ba4c8ce3a8388b05069407b98