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

Change-Id: I20c47f92a7311598c76b7856d9664ffda03459da