Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
am: c65e54940b

Change-Id: I2ecef404bfe0277f88278d2b8623d3b58b23a46b