am aee74944: am 823435f7: Merge remote-tracking branch \'upstream_linaro/linaro-libnl2_0\'

* commit 'aee749445619dd678094e416527b43d39d763bd8':