Merge "Really fix support for soname in apk."