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

Change-Id: Ib9aa383f3237ce176fddd12a59095c89ed49e00a