Merge "Dedup original dex file for classes transformed on first load." am: c700f00067
am: 3b6123b354

Change-Id: I11293f6a7107dfd0648775d15cc298e22a6593f9