Merge "Clean up some obsolete OpenBSD portability cruft." am: 80c99e30c0 am: 1ef56ca763
am: 9ad7593740

Change-Id: I91fc3f63a4d443d3fa05a5492c640b15c5f244d3