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

Change-Id: Ifb48d09d96f66e5daea543eca1f1bba5a6bc4894