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

Change-Id: I28ee11c91dfb3b423a4894bd613574bf448e2358