Merge "Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak"