Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"