Merge "Sync stddef.h"