Merge "Remove direct dependency on the internal libdexfile library."