Merge "Remove old workaround for unloading unversioned soinfo"
am: 594e594f05

Change-Id: Icabf9d448adcf99cd6b32d2f3018d3ee322385e6