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

* commit '67bdd4b8a1e56ba7cb4dd1d946d279ba32674e35':
  Improve detection of already loaded libraries