Merge "Make libdexfile tests independent of runtime" am: 661078b334 am: 0fd0a8c42b
am: 11b3ac7c04

Change-Id: I26a39ef3dbea71ad8bdae2ffd781230aed4e3457