Merge "Sync <net/if_types.h> with upstream."
authorElliott Hughes <enh@google.com>
Tue, 9 Dec 2014 23:07:44 +0000 (23:07 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 9 Dec 2014 23:07:45 +0000 (23:07 +0000)

Trivial merge