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

Change-Id: I2ff5748eb74d375e05a6d30f68a923c293eaae29