Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: 21c29cfade am: e6ab117292
am: bc43c7c05d

Change-Id: Iff52585c320e81883514b10753af095c3e434259