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

Change-Id: Id91114bd017c0d633f73dbcb21056b47d2bffba1