am 86bc436e: Merge "Improve detection of already loaded libraries"

* commit '86bc436e20621656cd76b653ae3396c6584259e5':
  Improve detection of already loaded libraries