Merge "Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak"
am: 498e122d91

Change-Id: I81421af3d75d9febeaafbd9256fd30f64534b45b