Merge "Refactor DexFile ownership"
am: d20a4d76c3

Change-Id: I1aa66ce9ffa0b45ad81d40e2d15784df8494df4b