Merge "Clean up some obsolete OpenBSD portability cruft."
am: 80c99e30c0

Change-Id: I0c90223896e5bc852ff000c7f78ce57078f717d1