Merge "Remove old workaround for unloading unversioned soinfo" am: 594e594f am: 121c824d am: 3a343a92 am: 8785385a Change-Id: Ie91a93e3f0a2431f6b8e75bf05946600bdf83741