Merge "Merge "init should #include <sys/sysmacros.h>" am: 64e3f88d69 am: 29b41dce6d am: 8cdef644b3" into oc-dev-plus-aosp
am: 22c5e80458

Change-Id: I74601341eca56298c0404e05e098f40ea05b80da