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

Change-Id: Iae3aa8fae7f5ed46734511669c978d23c857b60a