Merge "Simplify LoadNativeLibrary()" into nyc-dev
am: 657f5f76a6

* commit '657f5f76a678e6fbcc68b8035ada5d8747fd910a':
  Simplify LoadNativeLibrary()