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

Change-Id: I10af7d8fb06d344e3f78520313d29793cfc2bd02