Merge changes I11f1f820,Iafec1f83

* changes:
  Revert "Revert "Revert "Revert "(dl)Close native libraries on unload""""
  Revert "Revert "Remove double unloading hack""