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

Change-Id: I2d34f84445ea7476aca50abc193916919ba8d14f