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

Change-Id: I05286de7d243823d9cb7455ce98d3bd5b465a1d9