Merge "Simplify LoadNativeLibrary()"
am: 9bab082adb

* commit '9bab082adb251327b806d537d6710c16b9897de9':
  Simplify LoadNativeLibrary()