Merge "Refactor DexFile ownership"