Merge "libdexfile: Fix inconsequential resource leak in test" am: 37af3eeac5
am: d4fa944f21

Change-Id: Ibc559b68288b5f35339d71dcad08aa8198df97df