Merge commit '8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6' into gingerbread-plus-aosp * commit '8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6': Add unistd.h for size_t typedef to fix sim-eng
Merge commit '8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6' into gingerbread-plus-aosp * commit '8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6': Add unistd.h for size_t typedef to fix sim-eng