Cope with <sys/sysmacros.h> no longer being included by <sys/types.h>. am: 1dd6771e0f
am: 134977ffc3

Change-Id: I370b793e85e0ee09cb814e13c0c1574b0b214505