Merge "Erase elements in LinkedList::remove_if"

diff --cc linker/linker.cpp
index 9c3baae,3be2ec6..63c41c0
--- 1/linker/linker.cpp
--- 2/linker/linker.cpp
+++ b/linker/linker.cpp
@@@ -606,9 -606,11 +606,11 @@@ done
          return s;
      }
  
 -    return NULL;
 +    return nullptr;
  }
  
+ 
+ 
  // Another soinfo list allocator to use in dlsym. We don't reuse
  // SoinfoListAllocator because it is write-protected most of the time.
  static LinkerAllocator<LinkedListEntry<soinfo>> g_soinfo_list_allocator_rw;