[tz] A small first step in merging NetBSD changes into tzcode