Merge "Move libdexfile out of runtime" am: d1652d14fb am: 522fac2582
am: 65d708943e

Change-Id: I893e0b114cfc772f2e2ca46b2c467f8ec074361a