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

Change-Id: I789466536d74d319b31549baafae0e06c798731e