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

Change-Id: I948773bb1b8c30342f089430b0a9f42c6a002eb0