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

Change-Id: Ia9c0bba3fa290221d00bbfd7aec4aab65db5e4f0