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

Change-Id: Ice84a69fbbcd39787b9fa4ae568480c21a3f6b36