Merge "Revert "Change ClassExt.originalDexFile field to an opaque Object"" am: ce78db24 am: 2c52cfde am: a658156d Change-Id: Ic2c80933eae1f954ba7fe15b75c124bff3c865c5