Merge "libdexfile: Fix inconsequential resource leak in test"