Merge commit '7b40518e56a3238b28b24a786a2ff22d5a425765' into gingerbread-plus-aosp * commit '7b40518e56a3238b28b24a786a2ff22d5a425765': Change unistd.h to stddef.h to be correct
Merge commit '7b40518e56a3238b28b24a786a2ff22d5a425765' into gingerbread-plus-aosp * commit '7b40518e56a3238b28b24a786a2ff22d5a425765': Change unistd.h to stddef.h to be correct