Merge "added include for unistd.h that was missing" am: 98cc0e1f02 am: 371e0bf298 am: b1989aa336  -s ours
am: e4de9ec23e  -s ours

Change-Id: I2fb176ebded2f2a252ba6fccfd3282661fca9cc0