Merge "libcutils should #include <sys/sysmacros.h>"