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

Change-Id: I75504f62d5e1a5f897c59b6a480ec726fb4494de