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

Change-Id: I9a3993b3ac793479410132d0e3bd17d14804248f