Merge "include sys/sysmacros.h as needed"
am: 105f5ecfd8

Change-Id: I6e81118e4cb3c6a34752567d6c036c90820c884d