Merge "Change unistd.h to stddef.h to be correct" into gingerbread