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

Change-Id: Ifbd963ac88e5d4b2d60d48616064a99753f62e3e