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

Change-Id: I95417c3f5d170bd20bb696a75670774e5c4f858c