Merge "Make libdexfile tests independent of runtime"