Merge "include sys/sysmacros.h as needed" am: 105f5ecfd8 am: 9e0e531734
am: 01b3b9a574

Change-Id: I0908520a62978609982d096ba0b30a74b589ad18