Merge "Revert "Refactor DexFile ownership""
am: 0162450a86

Change-Id: Ica7a516eea7bde26e3c22520ebf9be9d443a123d