Android n mr1 preview 2
Merge \\"iputils assumes _GNU_SOURCE.\\" am: 2bb2e02629
am: 51c9113793

Change-Id: I84950172a06837e208e1982515133dafd12f65c7