Merge "Move libdexfile out of runtime"
am: d1652d14fb

Change-Id: I109c3470dd9b8992f32d5f9867978d648ae1e7fe