Merge "Remove direct dependency on the internal libdexfile library."
am: 829754ce78

Change-Id: Id52bcd9b8ff6cd4005445dba4afe5af3dd4e103d