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

Change-Id: I44a272d1c1305878978b44c896fc0c229687f240