Cope with <sys/sysmacros.h> no longer being included by <sys/types.h>. am:...
Cope with <sys/sysmacros.h> no longer being included by <sys/types.h>. am: 1dd6771e am: 134977ff am: c0b5e4fc
am: ac440d6d
Change-Id: I7540fb61e00d548514f946a98aecbabef53019d0