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

* commit 'b17cc8801a24464c9e0e9cb1829ebfb50f8588d4':
  Improve detection of already loaded libraries