Merge "Remove old workaround for unloading unversioned soinfo"