Merge "Define HAVE_SYS_SYSMACROS_H for Android."
am: 9b9a786601

Change-Id: If88a981783f2e1ce7a6714a19738a585dafda5b6