Merge "Include what you use: <unistd.h>" am: c0aff669f8

Change-Id: I16d9175cc467112187272f0a79c7dcb8c1d98036