Merge "Really fix support for soname in apk." am: 2f5dc0a066 am: 0a3cbe01a4
am: 279978161d

Change-Id: Ib14dcbb88c3e03642c4edc32a125fef02d6e6d17