Merge "Fix ownership of DexFile in profman" am: 9260b991fe
am: cf45bfe8f4

Change-Id: I5774f61bfe254b1403e4327e0e148949ed888b52