am e1a739ec: am 6a9b888d: Allow static C++ destructors to be properly called on dlclose().

Merge commit 'e1a739ec38a39fea9e66038dfc7cea364cb6a256'

* commit 'e1a739ec38a39fea9e66038dfc7cea364cb6a256':
  Allow static C++ destructors to be properly called on dlclose().