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

Change-Id: I3f3d72f6763c3a531d33af5ef0650e414fe8c007