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

Change-Id: I5a29913e5a2805dfd5d2f9045c179bff3d90ea20