Merge "Remove linux-unistd.h"