Merge "Use installed module stem for .so soname" am: 1c7debc95c am: d31cfcbbbb
am: 418db57b0e

Change-Id: Ie725528c73889c5c89d4207a6af2fa94a4299d5d