Merge "unistd.h: don't include sys/capability.h"