Merge "Revert "Refactor DexFile ownership""