Merge "_GNU_SOURCE must be defined before any #include." am: 983c39cf7d am: 63c8d4c2eb
am: 9f7363370e

Change-Id: I4a3dad2e0c350090383ddcf0d10bb14679929446