Merge changes I11f1f820,Iafec1f83 am: b88a2caa9a
am: 4835f17dc2

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

Change-Id: I978cb536c4c0cb4a6f969024fc2f2b1888ca6c0c