Merge "Clean up some obsolete NetBSD portability cruft." am: 8ccf486695
am: be928440af

Change-Id: If1a641d47e3b8c39c6a3cd0bb87aa538b54a6720