Merge "Extends ifaddrs for cases where the client cannot send RTM_GETLINK requests." am: 3af2071f76 am: 2ca00c7f98

Change-Id: I3ecfd467b68542c048ab97f919c898a0350bd41c