Merge "ARM: make sure __on_dlclose() actually gets called"