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

Change-Id: Iea980fc80cc363eed4896327ec62a2c8c8badd59