Merge "Remove more BSD cruft from the public headers."
authorElliott Hughes <enh@google.com>
Tue, 23 Dec 2014 20:14:52 +0000 (20:14 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 23 Dec 2014 20:14:52 +0000 (20:14 +0000)

Trivial merge