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

Change-Id: Iad64d1a9852a61dab3bef93ca557d0432e6a3e50