Merge "Move libdexfile out of runtime" am: a99ff49ab0
am: 868eac2f94

Change-Id: I0f927559800247dc57e6e61952b5246d5f5960b7