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

Change-Id: I6df794a181c30cf3ed2cd4206c2f0c3868133dbc