Merge "Fix call to LoadNativeLibrary" am: 2cab58141a
am: 846efa942a

* commit '846efa942a32a5615227660594ad287d48f03a26':
  Fix call to LoadNativeLibrary