Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread