Merge "Refresh header byteswap.h and dirent.h"