Merge "Simplify LoadNativeLibrary()" into nyc-dev