Merge "Stop depending on libnl." am: 445674ab7c
am: ebef33b85a

Change-Id: Iec2886ae41682e4b7721d0d97fa20c91ed56f748