Merge "added include for unistd.h that was missing"
am: 98cc0e1f02

Change-Id: Iba8ad7abd27b0e82e2ed23c9f539bd3511726e9c