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

Change-Id: Iad330e5266e27f412687209f3bd6375f777dc905