Merge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"" am: e51e3f988b am: de75505933
am: 456d5c6860

* commit '456d5c686052ee37b0aec50861d05237187dc097':
  Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"