Merge "init should #include <sys/sysmacros.h>"
am: 64e3f88d69

Change-Id: I1673d5b22668e0e6e2a0ee83e42dbdd904dcbdb8