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

Change-Id: I2e55d7c44ef8c06a3bb6364f8399e21d3d1dc354