Merge "libcutils should #include <sys/sysmacros.h>" am: c3b931aad3
am: 2668f35d31

Change-Id: If123865b83fd198055d4344bb9cc58376ccc5cd6