Merge "Make original dex file be more deduplicated" am: b8006e60d8
am: 8178792eb3

Change-Id: Ifaa0f3fc5bad3d96a61930033b0ff97b1b077cf4