Merge "Update references to internal libnl headers." into main