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