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

Change-Id: I85780db7809e9471cd61db3504857695175162e9