Merge "Change ClassExt.originalDexFile field to an opaque Object"
am: 4e37fffe9c

Change-Id: I9872c0d260cba64dafe0f0581ccff463ccf8f72a