am 80413c9f: Merge "Re-implement native library search and copies."

* commit '80413c9fe10acf36eaecd139198c7fc17e8af2e6':
  Re-implement native library search and copies.