Merge changes I11f1f820,Iafec1f83
am: b88a2caa9a

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

Change-Id: I695112e695d3682c68fc4fbf3144ed287920e4c0