Merge "Make libdexfile tests independent of runtime"
am: 661078b334

Change-Id: I20a437a7636b6e2e10a3a3789201614fe35c2417