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

Change-Id: Ibed5a2e73df995e234fb72949da53056ba8d71e3