Merge "Move libdexfile out of runtime"
am: a99ff49ab0

Change-Id: I2c1fc649d7bef7c645e61f6459e77de1257d7b12