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