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

Change-Id: I08d292ece8442f05749adce9b765fe2a1853ac7e