Fix tink dependencies after merge