Merge "Fix dex file pruning logic."