Merge "Really fix support for soname in apk."
am: 2f5dc0a066

Change-Id: If0e848a1c64a9561bf682aa51cd43184df8b3985