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

Change-Id: I12f7a1fff38d402d60d41071f8d206a0f11908e8