Diff reduce with upstream and prep for next set of content pushes
Add missing sys/time.h #include for timespecsub macro in lib/libnetbsd/sys/time.h