Merge "Fix the <netinet/ether.h> tests."