Merge "Fix unload of recursively linked library"

linker/linker.cpp

@@ -839,6 +839,7 @@ static soinfo* load_library(LoadTaskList& load_tasks, const char* name, int dlfl
   }
 
   if ((dlflags & RTLD_NOLOAD) != 0) {
+    DL_ERR("library \"%s\" wasn't loaded and RTLD_NOLOAD prevented it", name);
     return nullptr;
   }
 
@@ -946,7 +947,6 @@ static bool find_libraries(const char* const library_names[], size_t library_nam
     soinfo* needed_by = task->get_needed_by();
 
     if (is_recursive(si, needed_by)) {
-      soinfo_free(si);
       return false;
     }