Merge "Fix unload of recursively linked library"