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

Change-Id: I7487c7d3e566736733b6510072f6a32c2c4534ac