Merge "Revert "Revert "Change ClassExt.originalDexFile field to an opaque Object""" am: 0911eabb am: 06c64330 am: 9469aab9 Change-Id: Iaa45d292c0bf6f12f960c64babfa8015f803fa41