Merge "Fix call to LoadNativeLibrary"