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

Change-Id: I7540fb61e00d548514f946a98aecbabef53019d0