Merge "Add support for displaying soname in an apk." am: 4886a5bd59
am: cb839e8475

Change-Id: I651e448ba74644335fbd7513061ed740b431e794