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

Change-Id: I17d06509d8fa150b1313b01bf23e6cd892ebc987