Merge "Clean up some obsolete FreeBSD portability cruft."
am: 5951fcbd3f

Change-Id: I23745ed5f5ea2d87f7f149328103e5fbb46c4923