tree 9ed21a65a1cb25023916866b8e0d74c2bb683def
parent 94ab1ccfcf7b63080e4047908a1c34f94c033b1f
parent 0a3cbe01a452da6ae3e10d52160eec563fbb6aa6
author Christopher Ferris <cferris@google.com> 1552681286 -0700
committer android-build-merger <android-build-merger@google.com> 1552681286 -0700

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

Change-Id: Ice84a69fbbcd39787b9fa4ae568480c21a3f6b36