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

Change-Id: Ie7e8fba2c6885b1a97d9355d722a9374d66a751c